diff options
| author | archshift <admin@archshift.com> | 2014-04-22 14:36:39 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-04-22 14:36:39 +0200 |
| commit | 06f41699afe27a6be1de357466f9185403baa550 (patch) | |
| tree | 38b864d836e31b9066aebd0e0d14e3b5c99379ba /src/Entities/Entity.cpp | |
| parent | Fixed capitalization issues (diff) | |
| download | cuberite-06f41699afe27a6be1de357466f9185403baa550.tar cuberite-06f41699afe27a6be1de357466f9185403baa550.tar.gz cuberite-06f41699afe27a6be1de357466f9185403baa550.tar.bz2 cuberite-06f41699afe27a6be1de357466f9185403baa550.tar.lz cuberite-06f41699afe27a6be1de357466f9185403baa550.tar.xz cuberite-06f41699afe27a6be1de357466f9185403baa550.tar.zst cuberite-06f41699afe27a6be1de357466f9185403baa550.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 345e0054b..9a80d3e80 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -788,10 +788,10 @@ void cEntity::TickBurning(cChunk & a_Chunk) m_TicksSinceLastBurnDamage++; if (m_TicksSinceLastBurnDamage >= BURN_TICKS_PER_DAMAGE) { - if (!m_Fireproof) - { - TakeDamage(dtOnFire, NULL, BURN_DAMAGE, 0); - } + if (!m_IsFireproof) + { + TakeDamage(dtOnFire, NULL, BURN_DAMAGE, 0); + } m_TicksSinceLastBurnDamage = 0; } m_TicksLeftBurning--; @@ -859,10 +859,10 @@ void cEntity::TickBurning(cChunk & a_Chunk) m_TicksSinceLastLavaDamage++; if (m_TicksSinceLastLavaDamage >= LAVA_TICKS_PER_DAMAGE) { - if (!m_Fireproof) - { - TakeDamage(dtLavaContact, NULL, LAVA_DAMAGE, 0); - } + if (!m_IsFireproof) + { + TakeDamage(dtLavaContact, NULL, LAVA_DAMAGE, 0); + } m_TicksSinceLastLavaDamage = 0; } } @@ -880,10 +880,10 @@ void cEntity::TickBurning(cChunk & a_Chunk) m_TicksSinceLastFireDamage++; if (m_TicksSinceLastFireDamage >= FIRE_TICKS_PER_DAMAGE) { - if (!m_Fireproof) - { - TakeDamage(dtFireContact, NULL, FIRE_DAMAGE, 0); - } + if (!m_IsFireproof) + { + TakeDamage(dtFireContact, NULL, FIRE_DAMAGE, 0); + } m_TicksSinceLastFireDamage = 0; } } |