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

Replaced esCreeper with esMonster.

Browse Source 
Any monster will be able to explode, and also this fixes #425.
This commit is contained in:
madmaxoft 2013-12-23 22:36:22 +01:00
parent 5af74fe77c
commit 5bbe72bc90
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bindings/PluginLua.cpp
View File

@ -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 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 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 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 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; 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;

7
src/BlockID.h
View File

@ -833,14 +833,17 @@ enum eExplosionSource
{ {
esOther, esOther,
esPrimedTNT, esPrimedTNT,
esCreeper, esMonster,
esBed, esBed,
esEnderCrystal, esEnderCrystal,
esGhastFireball, esGhastFireball,
esWitherSkullBlack, esWitherSkullBlack,
esWitherSkullBlue, esWitherSkullBlue,
esWitherBirth, esWitherBirth,
esPlugin esPlugin,
// Obsolete constants, kept for compatibility, will be removed after some time:
esCreeper = esMonster,
} ; } ;
// tolua_end // tolua_end

2
src/World.h
View File

@ -420,7 +420,7 @@ public:
a_SourceData exact type depends on the a_Source: a_SourceData exact type depends on the a_Source:
| esOther | void * | | esOther | void * |
| esPrimedTNT | cTNTEntity * | | esPrimedTNT | cTNTEntity * |
| esCreeper | cCreeper * | | esMonster | cMonster * |
| esBed | cVector3i * | | esBed | cVector3i * |
| esEnderCrystal | Vector3i * | | esEnderCrystal | Vector3i * |
| esGhastFireball | cGhastFireball * | | esGhastFireball | cGhastFireball * |