diff options
| author | Mattes D <github@xoft.cz> | 2014-04-27 22:42:22 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-04-27 22:42:22 +0200 |
| commit | 051bb8cfbdfcf110d7eb9531f6f8311d2afe68b6 (patch) | |
| tree | 9af1851cfba5c7aaa08212f6723a92a847122e15 | |
| parent | Merge pull request #959 from mc-server/fixes-2 (diff) | |
| parent | Removed Old Asserts (diff) | |
| download | cuberite-051bb8cfbdfcf110d7eb9531f6f8311d2afe68b6.tar cuberite-051bb8cfbdfcf110d7eb9531f6f8311d2afe68b6.tar.gz cuberite-051bb8cfbdfcf110d7eb9531f6f8311d2afe68b6.tar.bz2 cuberite-051bb8cfbdfcf110d7eb9531f6f8311d2afe68b6.tar.lz cuberite-051bb8cfbdfcf110d7eb9531f6f8311d2afe68b6.tar.xz cuberite-051bb8cfbdfcf110d7eb9531f6f8311d2afe68b6.tar.zst cuberite-051bb8cfbdfcf110d7eb9531f6f8311d2afe68b6.zip | |
| -rw-r--r-- | src/Bindings/PluginLua.cpp | 2 | ||||
| -rw-r--r-- | src/ByteBuffer.cpp | 2 | ||||
| -rw-r--r-- | src/WebAdmin.cpp | 5 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp index dcc816839..cb55715a6 100644 --- a/src/Bindings/PluginLua.cpp +++ b/src/Bindings/PluginLua.cpp @@ -1042,7 +1042,7 @@ bool cPluginLua::OnPluginMessage(cClientHandle & a_Client, const AString & a_Cha cLuaRefs & Refs = m_HookMap[cPluginManager::HOOK_PLUGIN_MESSAGE]; for (cLuaRefs::iterator itr = Refs.begin(), end = Refs.end(); itr != end; ++itr) { - m_LuaState.Call((int)(**itr), &a_Client, a_Channel, a_Message); + m_LuaState.Call((int)(**itr), &a_Client, a_Channel, a_Message, cLuaState::Return, res); if (res) { return true; diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp index c634dc308..24f91b195 100644 --- a/src/ByteBuffer.cpp +++ b/src/ByteBuffer.cpp @@ -887,9 +887,7 @@ void cByteBuffer::AdvanceReadPos(size_t a_Count) void cByteBuffer::CheckValid(void) const { - ASSERT(m_ReadPos >= 0); ASSERT(m_ReadPos < m_BufferSize); - ASSERT(m_WritePos >= 0); ASSERT(m_WritePos < m_BufferSize); } diff --git a/src/WebAdmin.cpp b/src/WebAdmin.cpp index a3b3cc5be..737705d7c 100644 --- a/src/WebAdmin.cpp +++ b/src/WebAdmin.cpp @@ -285,11 +285,6 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque Content = GetDefaultPage(); } - if (ShouldWrapInTemplate && (URL.size() > 1)) - { - Content += "\n<p><a href='" + BaseURL + "'>Go back</a></p>"; - } - int MemUsageKiB = cRoot::GetPhysicalRAMUsage(); if (MemUsageKiB > 0) { |