flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #958 from worktycho/bugfix

Browse Source 
Bugfix
This commit is contained in:
Mattes D 2014-04-27 22:42:22 +02:00
commit 051bb8cfbd
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bindings/PluginLua.cpp
View File

@ -1042,7 +1042,7 @@ bool cPluginLua::OnPluginMessage(cClientHandle & a_Client, const AString & a_Cha
cLuaRefs & Refs = m_HookMap[cPluginManager::HOOK_PLUGIN_MESSAGE]; cLuaRefs & Refs = m_HookMap[cPluginManager::HOOK_PLUGIN_MESSAGE];
for (cLuaRefs::iterator itr = Refs.begin(), end = Refs.end(); itr != end; ++itr) 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) if (res)
{ {
return true; return true;

2
src/ByteBuffer.cpp
View File

@ -887,9 +887,7 @@ void cByteBuffer::AdvanceReadPos(size_t a_Count)
void cByteBuffer::CheckValid(void) const void cByteBuffer::CheckValid(void) const
{ {
ASSERT(m_ReadPos >= 0);
ASSERT(m_ReadPos < m_BufferSize); ASSERT(m_ReadPos < m_BufferSize);
ASSERT(m_WritePos >= 0);
ASSERT(m_WritePos < m_BufferSize); ASSERT(m_WritePos < m_BufferSize);
} }

5
src/WebAdmin.cpp
View File

@ -285,11 +285,6 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque
Content = GetDefaultPage(); Content = GetDefaultPage();
} }
if (ShouldWrapInTemplate && (URL.size() > 1))
{
Content += "\n<p><a href='" + BaseURL + "'>Go back</a></p>";
}
int MemUsageKiB = cRoot::GetPhysicalRAMUsage(); int MemUsageKiB = cRoot::GetPhysicalRAMUsage();
if (MemUsageKiB > 0) if (MemUsageKiB > 0)
{ {