From 3d044d2dde2e348dc5c9f6a7fe44e914ef501878 Mon Sep 17 00:00:00 2001
From: Aiden Neill <aidenneill@gmail.com>
Date: Wed, 25 Nov 2020 10:56:55 -0700
Subject: Added magma block contact damage (#5055)

* 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
---
 src/Defines.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/Defines.cpp')

diff --git a/src/Defines.cpp b/src/Defines.cpp
index d0b6ff956..7e4274bd5 100644
--- a/src/Defines.cpp
+++ b/src/Defines.cpp
@@ -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"},
-- 
cgit v1.2.3