flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Adjust lava damage values (#4020)

Browse Source 
Fixes isue #2925
This commit is contained in:
Alexander Harkness 2017-09-12 09:02:17 +01:00 committed by GitHub
parent 3ec9e6ec87
commit a4c07d2f98
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Entity.cpp
View File

@ -1277,7 +1277,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
m_TicksSinceLastFireDamage++; m_TicksSinceLastFireDamage++;
if (m_TicksSinceLastFireDamage >= FIRE_TICKS_PER_DAMAGE) if (m_TicksSinceLastFireDamage >= FIRE_TICKS_PER_DAMAGE)
{ {
if (!IsFireproof()) if (!IsFireproof() && !HasLava)
{ {
TakeDamage(dtFireContact, nullptr, FIRE_DAMAGE, 0); TakeDamage(dtFireContact, nullptr, FIRE_DAMAGE, 0);
} }

2
src/Entities/Entity.h
View File

@ -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_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 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_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_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 static const int BURN_DAMAGE = 1; ///< Damage to deal when the entity is burning