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

Merge branch 'master' into PreventNewWarnings

Browse Source
This commit is contained in:
tycho
2015-05-23 11:31:03 +01:00
parent 7f35671b21 0daa6a92ea
commit 1577a080ee
21 changed files with 143 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Entity.cpp
View File

@@ -1403,10 +1403,10 @@ bool cEntity::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn)
return false;
}
// Ask the plugins if the entity is allowed to change the world
if (cRoot::Get()->GetPluginManager()->CallHookEntityChangeWorld(*this, *a_World))
// Ask the plugins if the entity is allowed to changing the world
if (cRoot::Get()->GetPluginManager()->CallHookEntityChangingWorld(*this, *a_World))
{
// A Plugin doesn't allow the entity to change the world
// A Plugin doesn't allow the entity to changing the world
return false;
}