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/Entity.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Entities/Entity.h') diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 4322665c3..20712e7ea 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -420,6 +420,9 @@ public: /** Detects the time for application of cacti damage */ virtual void DetectCacti(void); + /** Detects the time for application of magma block damage */ + virtual void DetectMagma(void); + /** Detects whether we are in a portal block and begins teleportation procedures if so Returns true if MoveToWorld() was called, false if not */ -- cgit v1.2.3