diff options
author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-28 20:40:26 +0200 |
---|---|---|
committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-28 20:40:26 +0200 |
commit | a0f7dea3be8bc6cb693177da000667cb914c64e9 (patch) | |
tree | 22c842124f703cb24fd4efca706f53108d33ff63 | |
parent | Pickup: Fixed a possible crash when a pickup went up above the world. (diff) | |
download | cuberite-a0f7dea3be8bc6cb693177da000667cb914c64e9.tar cuberite-a0f7dea3be8bc6cb693177da000667cb914c64e9.tar.gz cuberite-a0f7dea3be8bc6cb693177da000667cb914c64e9.tar.bz2 cuberite-a0f7dea3be8bc6cb693177da000667cb914c64e9.tar.lz cuberite-a0f7dea3be8bc6cb693177da000667cb914c64e9.tar.xz cuberite-a0f7dea3be8bc6cb693177da000667cb914c64e9.tar.zst cuberite-a0f7dea3be8bc6cb693177da000667cb914c64e9.zip |
-rw-r--r-- | source/Bindings.cpp | 4 | ||||
-rw-r--r-- | source/Bindings.h | 2 | ||||
-rw-r--r-- | source/Pawn.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/source/Bindings.cpp b/source/Bindings.cpp index cd6a057e4..eec033c85 100644 --- a/source/Bindings.cpp +++ b/source/Bindings.cpp @@ -1,6 +1,6 @@ /* ** Lua binding: AllToLua -** Generated automatically by tolua++-1.0.92 on 04/17/13 19:40:39. +** Generated automatically by tolua++-1.0.92 on 04/28/13 20:39:37. */ #ifndef __cplusplus @@ -24499,6 +24499,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S) tolua_constant(tolua_S,"dtFireContact",dtFireContact); tolua_constant(tolua_S,"dtInVoid",dtInVoid); tolua_constant(tolua_S,"dtPotionOfHarming",dtPotionOfHarming); + tolua_constant(tolua_S,"dtAdmin",dtAdmin); tolua_constant(tolua_S,"dtPawnAttack",dtPawnAttack); tolua_constant(tolua_S,"dtEntityAttack",dtEntityAttack); tolua_constant(tolua_S,"dtMob",dtMob); @@ -24515,6 +24516,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S) tolua_constant(tolua_S,"dtPoison",dtPoison); tolua_constant(tolua_S,"dtBurning",dtBurning); tolua_constant(tolua_S,"dtInFire",dtInFire); + tolua_constant(tolua_S,"dtPlugin",dtPlugin); tolua_cclass(tolua_S,"TakeDamageInfo","TakeDamageInfo","",NULL); tolua_beginmodule(tolua_S,"TakeDamageInfo"); tolua_variable(tolua_S,"DamageType",tolua_get_TakeDamageInfo_DamageType,tolua_set_TakeDamageInfo_DamageType); diff --git a/source/Bindings.h b/source/Bindings.h index ff29c1589..c9f311193 100644 --- a/source/Bindings.h +++ b/source/Bindings.h @@ -1,6 +1,6 @@ /* ** Lua binding: AllToLua -** Generated automatically by tolua++-1.0.92 on 04/17/13 19:40:39. +** Generated automatically by tolua++-1.0.92 on 04/28/13 20:39:38. */ /* Exported function */ diff --git a/source/Pawn.h b/source/Pawn.h index dddb98699..e0dca8b72 100644 --- a/source/Pawn.h +++ b/source/Pawn.h @@ -32,6 +32,7 @@ enum eDamageType dtFireContact, // Standing inside a fire block dtInVoid, // Falling into the Void (Y < 0) dtPotionOfHarming, + dtAdmin, // Damage applied by an admin command // Some common synonyms: dtPawnAttack = dtAttack, @@ -50,6 +51,7 @@ enum eDamageType dtPoison = dtPoisoning, dtBurning = dtOnFire, dtInFire = dtFireContact, + dtPlugin = dtAdmin, } ; |