From 3d044d2dde2e348dc5c9f6a7fe44e914ef501878 Mon Sep 17 00:00:00 2001 From: Aiden Neill 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/Entities/Player.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Entities/Player.cpp') diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index a8afb2b95..fb0cdf271 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1194,6 +1194,7 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI) case dtSuffocating: return GetRandomProvider().RandBool() ? "git merge'd into a block" : "fused with a block"; case dtStarving: return "forgot the importance of food"; case dtCactusContact: return "was impaled on a cactus"; + case dtMagmaContact: return "discovered the floor was lava"; case dtLavaContact: return "was melted by lava"; case dtPoisoning: return "died from septicaemia"; case dtWithering: return "is a husk of their former selves"; -- cgit v1.2.3