summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorbibo38 <bibo38@github.com>2015-10-31 16:24:45 +0100
committerbibo38 <bibo38@github.com>2015-10-31 23:06:10 +0100
commit73b8be0fef6603b5dd3a101c26a4947669068d5e (patch)
tree671987e9a48544fd0fc37135732feebdca697caa /src/Entities/Entity.cpp
parentMerge pull request #2549 from cuberite/TouchGround (diff)
downloadcuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar
cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.gz
cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.bz2
cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.lz
cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.xz
cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.zst
cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index a70ac6d1a..68e2cb1df 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1104,7 +1104,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
m_TicksSinceLastBurnDamage++;
if (m_TicksSinceLastBurnDamage >= BURN_TICKS_PER_DAMAGE)
{
- if (!m_IsFireproof)
+ if (!IsFireproof())
{
TakeDamage(dtOnFire, nullptr, BURN_DAMAGE, 0);
}
@@ -1175,7 +1175,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
m_TicksSinceLastLavaDamage++;
if (m_TicksSinceLastLavaDamage >= LAVA_TICKS_PER_DAMAGE)
{
- if (!m_IsFireproof)
+ if (!IsFireproof())
{
TakeDamage(dtLavaContact, nullptr, LAVA_DAMAGE, 0);
}
@@ -1196,7 +1196,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
m_TicksSinceLastFireDamage++;
if (m_TicksSinceLastFireDamage >= FIRE_TICKS_PER_DAMAGE)
{
- if (!m_IsFireproof)
+ if (!IsFireproof())
{
TakeDamage(dtFireContact, nullptr, FIRE_DAMAGE, 0);
}