From e33eb529addf7ca8870a02725e74d7120912eb6e Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Thu, 7 Sep 2017 09:59:08 +0100 Subject: Fire effect now shown for creative and spectator mode players (#3998) * Fire effect now shown for creative and spectator mode players Fixes #3989 * Add documentation for IsFireproof --- src/Entities/Entity.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/Entities/Entity.cpp') diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index b78c4dd82..33f5a6135 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1180,6 +1180,13 @@ void cEntity::TickBurning(cChunk & a_Chunk) // Remember the current burning state: bool HasBeenBurning = (m_TicksLeftBurning > 0); + // Fireproof entities burn out on the next tick + if (IsFireproof()) + { + m_TicksLeftBurning = 0; + } + + // Fire is extinguished by rain if (GetWorld()->IsWeatherWetAt(POSX_TOINT, POSZ_TOINT)) { if (POSY_TOINT > m_World->GetHeight(POSX_TOINT, POSZ_TOINT)) -- cgit v1.2.3