diff options
| author | Lukas Pioch <lukas@zgow.de> | 2015-05-21 12:27:54 +0200 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2015-05-21 12:27:54 +0200 |
| commit | bc838e5bd28172cf6dd1c1a4568270cb4250cac4 (patch) | |
| tree | cb7d0aa34f6f3bff4ce24642c4e23a0328eb6c65 /src/Entities | |
| parent | Merge pull request #2074 from SafwatHalaby/rmUnique (diff) | |
| download | cuberite-bc838e5bd28172cf6dd1c1a4568270cb4250cac4.tar cuberite-bc838e5bd28172cf6dd1c1a4568270cb4250cac4.tar.gz cuberite-bc838e5bd28172cf6dd1c1a4568270cb4250cac4.tar.bz2 cuberite-bc838e5bd28172cf6dd1c1a4568270cb4250cac4.tar.lz cuberite-bc838e5bd28172cf6dd1c1a4568270cb4250cac4.tar.xz cuberite-bc838e5bd28172cf6dd1c1a4568270cb4250cac4.tar.zst cuberite-bc838e5bd28172cf6dd1c1a4568270cb4250cac4.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Entity.cpp | 6 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index bc2b3e93e..dca44488b 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -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; } diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 01ad26297..f23d58ed1 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1606,9 +1606,10 @@ bool cPlayer::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn) return false; } - if (cRoot::Get()->GetPluginManager()->CallHookEntityChangeWorld(*this, *a_World)) + // Ask the plugins if the player is allowed to changing the world + if (cRoot::Get()->GetPluginManager()->CallHookEntityChangingWorld(*this, *a_World)) { - // A Plugin doesn't allow the player to change the world + // A Plugin doesn't allow the player to changing the world return false; } |