diff options
| author | madmaxoft <github@xoft.cz> | 2013-12-23 22:36:22 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-12-23 22:36:22 +0100 |
| commit | 5bbe72bc905b8729ac3bb7a47dcf886eec759d85 (patch) | |
| tree | fff2bb0ce5fd3f64d41b03e109ab81991cd5575a | |
| parent | Fixed bug where snowgolems could replace non-solid blocks to snow blocks. (diff) | |
| download | cuberite-5bbe72bc905b8729ac3bb7a47dcf886eec759d85.tar cuberite-5bbe72bc905b8729ac3bb7a47dcf886eec759d85.tar.gz cuberite-5bbe72bc905b8729ac3bb7a47dcf886eec759d85.tar.bz2 cuberite-5bbe72bc905b8729ac3bb7a47dcf886eec759d85.tar.lz cuberite-5bbe72bc905b8729ac3bb7a47dcf886eec759d85.tar.xz cuberite-5bbe72bc905b8729ac3bb7a47dcf886eec759d85.tar.zst cuberite-5bbe72bc905b8729ac3bb7a47dcf886eec759d85.zip | |
| -rw-r--r-- | src/Bindings/PluginLua.cpp | 2 | ||||
| -rw-r--r-- | src/BlockID.h | 7 | ||||
| -rw-r--r-- | src/World.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp index 0d17c9ce2..0e5a66cd6 100644 --- a/src/Bindings/PluginLua.cpp +++ b/src/Bindings/PluginLua.cpp @@ -386,7 +386,7 @@ bool cPluginLua::OnExploded(cWorld & a_World, double a_ExplosionSize, bool a_Can { case esOther: m_LuaState.Call((int)(**itr), &a_World, a_ExplosionSize, a_CanCauseFire, a_X, a_Y, a_Z, a_Source, a_SourceData, cLuaState::Return, res); break; case esPrimedTNT: m_LuaState.Call((int)(**itr), &a_World, a_ExplosionSize, a_CanCauseFire, a_X, a_Y, a_Z, a_Source, (cTNTEntity *)a_SourceData, cLuaState::Return, res); break; - case esCreeper: m_LuaState.Call((int)(**itr), &a_World, a_ExplosionSize, a_CanCauseFire, a_X, a_Y, a_Z, a_Source, (cCreeper *)a_SourceData, cLuaState::Return, res); break; + case esMonster: m_LuaState.Call((int)(**itr), &a_World, a_ExplosionSize, a_CanCauseFire, a_X, a_Y, a_Z, a_Source, (cMonster *)a_SourceData, cLuaState::Return, res); break; case esBed: m_LuaState.Call((int)(**itr), &a_World, a_ExplosionSize, a_CanCauseFire, a_X, a_Y, a_Z, a_Source, (Vector3i *)a_SourceData, cLuaState::Return, res); break; case esEnderCrystal: m_LuaState.Call((int)(**itr), &a_World, a_ExplosionSize, a_CanCauseFire, a_X, a_Y, a_Z, a_Source, (Vector3i *)a_SourceData, cLuaState::Return, res); break; case esGhastFireball: m_LuaState.Call((int)(**itr), &a_World, a_ExplosionSize, a_CanCauseFire, a_X, a_Y, a_Z, a_Source, a_SourceData, cLuaState::Return, res); break; diff --git a/src/BlockID.h b/src/BlockID.h index 9742e9745..288719ccf 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -833,14 +833,17 @@ enum eExplosionSource { esOther, esPrimedTNT, - esCreeper, + esMonster, esBed, esEnderCrystal, esGhastFireball, esWitherSkullBlack, esWitherSkullBlue, esWitherBirth, - esPlugin + esPlugin, + + // Obsolete constants, kept for compatibility, will be removed after some time: + esCreeper = esMonster, } ; // tolua_end diff --git a/src/World.h b/src/World.h index 4f9bf67e7..c067252d9 100644 --- a/src/World.h +++ b/src/World.h @@ -420,7 +420,7 @@ public: a_SourceData exact type depends on the a_Source: | esOther | void * | | esPrimedTNT | cTNTEntity * | - | esCreeper | cCreeper * | + | esMonster | cMonster * | | esBed | cVector3i * | | esEnderCrystal | Vector3i * | | esGhastFireball | cGhastFireball * | |