diff options
| author | Alexander Harkness <me@bearbin.net> | 2017-09-12 10:02:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 10:02:17 +0200 |
| commit | a4c07d2f98edb650d586caaa08feb8f4b16cc639 (patch) | |
| tree | 81f918c95254f806cdd1d74b512cc55603191e0b /src | |
| parent | Limit how long cRoot::InputThread may block (#4019) (diff) | |
| download | cuberite-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 'src')
| -rw-r--r-- | src/Entities/Entity.cpp | 2 | ||||
| -rw-r--r-- | src/Entities/Entity.h | 2 |
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 |