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

Added magma block contact damage (#5055)

Browse Source 
* Added magma block contact damage
* Fireproof entities do not take damage from magma
* Fire resistance prevents magma damage
* No magma damage when hovering over magma block
This commit is contained in:
Aiden Neill
2020-11-25 10:56:55 -07:00
committed by GitHub
parent e35519ec8a
commit 3d044d2dde
6 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Defines.cpp
View File

@@ -273,6 +273,7 @@ AString DamageTypeToString(eDamageType a_DamageType)
case dtAdmin: return "dtAdmin";
case dtAttack: return "dtAttack";
case dtCactusContact: return "dtCactusContact";
case dtMagmaContact: return "dtMagmaContact";
case dtDrowning: return "dtDrowning";
case dtEnderPearl: return "dtEnderPearl";
case dtEnvironment: return "dtEnvironment";
@@ -323,6 +324,7 @@ eDamageType StringToDamageType(const AString & a_DamageTypeString)
{ dtSuffocating, "dtSuffocation"},
{ dtStarving, "dtStarving"},
{ dtCactusContact, "dtCactusContact"},
{ dtMagmaContact, "dtMagmaContact"},
{ dtLavaContact, "dtLavaContact"},
{ dtPoisoning, "dtPoisoning"},
{ dtWithering, "dtWithering"},
@@ -350,6 +352,7 @@ eDamageType StringToDamageType(const AString & a_DamageTypeString)
{ dtCactusContact, "dtCactus"},
{ dtCactusContact, "dtCactuses"},
{ dtCactusContact, "dtCacti"},
{ dtMagmaContact, "dtMagma"},
{ dtLavaContact, "dtLava"},
{ dtPoisoning, "dtPoison"},
{ dtWithering, "dtWither"},