summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2017-09-12 10:02:17 +0200
committerGitHub <noreply@github.com>2017-09-12 10:02:17 +0200
commita4c07d2f98edb650d586caaa08feb8f4b16cc639 (patch)
tree81f918c95254f806cdd1d74b512cc55603191e0b /src/Entities/Entity.cpp
parentLimit how long cRoot::InputThread may block (#4019) (diff)
downloadcuberite-a4c07d2f98edb650d586caaa08feb8f4b16cc639.tar
cuberite-a4c07d2f98edb650d586caaa08feb8f4b16cc639.tar.gz
cuberite-a4c07d2f98edb650d586caaa08feb8f4b16cc639.tar.bz2
cuberite-a4c07d2f98edb650d586caaa08feb8f4b16cc639.tar.lz
cuberite-a4c07d2f98edb650d586caaa08feb8f4b16cc639.tar.xz
cuberite-a4c07d2f98edb650d586caaa08feb8f4b16cc639.tar.zst
cuberite-a4c07d2f98edb650d586caaa08feb8f4b16cc639.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index a57449122..90aefd082 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1277,7 +1277,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
m_TicksSinceLastFireDamage++;
if (m_TicksSinceLastFireDamage >= FIRE_TICKS_PER_DAMAGE)
{
- if (!IsFireproof())
+ if (!IsFireproof() && !HasLava)
{
TakeDamage(dtFireContact, nullptr, FIRE_DAMAGE, 0);
}