diff options
| author | Alexander Harkness <me@bearbin.net> | 2015-10-31 23:18:27 +0100 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2015-10-31 23:18:27 +0100 |
| commit | b13fd00ec44cc3fc4ad0395b3b9df04de00617b5 (patch) | |
| tree | 671987e9a48544fd0fc37135732feebdca697caa /src/Entities/Entity.cpp | |
| parent | Merge pull request #2549 from cuberite/TouchGround (diff) | |
| parent | Implemented the FireResistence potion effects. (diff) | |
| download | cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.gz cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.bz2 cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.lz cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.xz cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.zst cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 6 |
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); } |