summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Entities/Entity.h2
2 files changed, 2 insertions, 2 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);
}
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 3dc2d8f42..4174160bf 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -138,7 +138,7 @@ public:
static const int FIRE_TICKS_PER_DAMAGE = 10; ///< Ticks to wait between damaging an entity when it stands in fire
static const int FIRE_DAMAGE = 1; ///< Damage to deal when standing in fire
static const int LAVA_TICKS_PER_DAMAGE = 10; ///< Ticks to wait between damaging an entity when it stands in lava
- static const int LAVA_DAMAGE = 5; ///< Damage to deal when standing in lava
+ static const int LAVA_DAMAGE = 4; ///< Damage to deal when standing in lava
static const int BURN_TICKS_PER_DAMAGE = 20; ///< Ticks to wait between damaging an entity when it is burning
static const int BURN_DAMAGE = 1; ///< Damage to deal when the entity is burning