summaryrefslogtreecommitdiffstats
path: root/src/Bindings/PluginLua.cpp
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/Bindings/PluginLua.cpp
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/Bindings/PluginLua.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp
index a8be26f71..234bf579b 100644
--- a/src/Bindings/PluginLua.cpp
+++ b/src/Bindings/PluginLua.cpp
@@ -534,7 +534,7 @@ bool cPluginLua::OnEntityAddEffect(cEntity & a_Entity, int a_EffectType, int a_E
-bool cPluginLua::OnEntityChangeWorld(cEntity & a_Entity, cWorld & a_World)
+bool cPluginLua::OnEntityChangingWorld(cEntity & a_Entity, cWorld & a_World)
{
cCSLock Lock(m_CriticalSection);
if (!m_LuaState.IsValid())
@@ -542,7 +542,7 @@ bool cPluginLua::OnEntityChangeWorld(cEntity & a_Entity, cWorld & a_World)
return false;
}
bool res = false;
- cLuaRefs & Refs = m_HookMap[cPluginManager::HOOK_ENTITY_CHANGE_WORLD];
+ cLuaRefs & Refs = m_HookMap[cPluginManager::HOOK_ENTITY_CHANGING_WORLD];
for (cLuaRefs::iterator itr = Refs.begin(), end = Refs.end(); itr != end; ++itr)
{
m_LuaState.Call((int)(**itr), &a_Entity, &a_World, cLuaState::Return, res);
@@ -1932,7 +1932,7 @@ const char * cPluginLua::GetHookFnName(int a_HookType)
case cPluginManager::HOOK_DISCONNECT: return "OnDisconnect";
case cPluginManager::HOOK_PLAYER_ANIMATION: return "OnPlayerAnimation";
case cPluginManager::HOOK_ENTITY_ADD_EFFECT: return "OnEntityAddEffect";
- case cPluginManager::HOOK_ENTITY_CHANGE_WORLD: return "OnEntityChangeWorld";
+ case cPluginManager::HOOK_ENTITY_CHANGING_WORLD: return "OnEntityChangingWorld";
case cPluginManager::HOOK_ENTITY_CHANGED_WORLD: return "OnEntityChangedWorld";
case cPluginManager::HOOK_ENTITY_TELEPORT: return "OnEntityTeleport";
case cPluginManager::HOOK_EXECUTE_COMMAND: return "OnExecuteCommand";