summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2017-09-07 10:59:08 +0200
committerGitHub <noreply@github.com>2017-09-07 10:59:08 +0200
commite33eb529addf7ca8870a02725e74d7120912eb6e (patch)
tree351db4a5555f2a8bf3b8ea905c90edfbbcf2f4d5 /src/Entities/Entity.cpp
parentUpdated APIDoc (#3985) (diff)
downloadcuberite-e33eb529addf7ca8870a02725e74d7120912eb6e.tar
cuberite-e33eb529addf7ca8870a02725e74d7120912eb6e.tar.gz
cuberite-e33eb529addf7ca8870a02725e74d7120912eb6e.tar.bz2
cuberite-e33eb529addf7ca8870a02725e74d7120912eb6e.tar.lz
cuberite-e33eb529addf7ca8870a02725e74d7120912eb6e.tar.xz
cuberite-e33eb529addf7ca8870a02725e74d7120912eb6e.tar.zst
cuberite-e33eb529addf7ca8870a02725e74d7120912eb6e.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp7
1 files changed, 7 insertions, 0 deletions
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))