summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-05-21 12:57:25 +0200
committerMattes D <github@xoft.cz>2015-05-21 12:57:25 +0200
commit6bafff056038ca5909343b454318ea3dc15c0793 (patch)
tree6a6b223ffd7e5b2edf9f0f7f45b76f20f11fecaf /src/Entities
parentMerge pull request #2085 from mc-server/EquifaxCerts (diff)
parentRenamed hook HOOK_ENTITY_CHANGE_WORLD (diff)
downloadcuberite-6bafff056038ca5909343b454318ea3dc15c0793.tar
cuberite-6bafff056038ca5909343b454318ea3dc15c0793.tar.gz
cuberite-6bafff056038ca5909343b454318ea3dc15c0793.tar.bz2
cuberite-6bafff056038ca5909343b454318ea3dc15c0793.tar.lz
cuberite-6bafff056038ca5909343b454318ea3dc15c0793.tar.xz
cuberite-6bafff056038ca5909343b454318ea3dc15c0793.tar.zst
cuberite-6bafff056038ca5909343b454318ea3dc15c0793.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp6
-rw-r--r--src/Entities/Player.cpp5
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;
}