diff options
author | madmaxoft <github@xoft.cz> | 2014-04-28 22:05:02 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-04-28 22:05:02 +0200 |
commit | 0b16e6821ff475dca0539426ec403241170ce93d (patch) | |
tree | e272cae036cd9117e1d1f4cea3555c0c0d3aa748 /src/Mobs/Wither.cpp | |
parent | Added the G1 root cert. (diff) | |
parent | Merge pull request #940 from Howaner/GlobalFixes (diff) | |
download | cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.gz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.bz2 cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.lz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.xz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.zst cuberite-0b16e6821ff475dca0539426ec403241170ce93d.zip |
Diffstat (limited to 'src/Mobs/Wither.cpp')
-rw-r--r-- | src/Mobs/Wither.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Mobs/Wither.cpp b/src/Mobs/Wither.cpp index 8f5d28b68..5b6e895e1 100644 --- a/src/Mobs/Wither.cpp +++ b/src/Mobs/Wither.cpp @@ -10,7 +10,7 @@ cWither::cWither(void) : super("Wither", mtWither, "mob.wither.hurt", "mob.wither.death", 0.9, 4.0), - m_InvulnerableTicks(220) + m_WitherInvulnerableTicks(220) { SetMaxHealth(300); } @@ -40,24 +40,24 @@ bool cWither::Initialize(cWorld * a_World) -void cWither::DoTakeDamage(TakeDamageInfo & a_TDI) +bool cWither::DoTakeDamage(TakeDamageInfo & a_TDI) { if (a_TDI.DamageType == dtDrowning) { - return; + return false; } - if (m_InvulnerableTicks > 0) + if (m_WitherInvulnerableTicks > 0) { - return; + return false; } if (IsArmored() && (a_TDI.DamageType == dtRangedAttack)) { - return; + return false; } - super::DoTakeDamage(a_TDI); + return super::DoTakeDamage(a_TDI); } @@ -68,16 +68,16 @@ void cWither::Tick(float a_Dt, cChunk & a_Chunk) { super::Tick(a_Dt, a_Chunk); - if (m_InvulnerableTicks > 0) + if (m_WitherInvulnerableTicks > 0) { - unsigned int NewTicks = m_InvulnerableTicks - 1; + unsigned int NewTicks = m_WitherInvulnerableTicks - 1; if (NewTicks == 0) { m_World->DoExplosionAt(7.0, GetPosX(), GetPosY(), GetPosZ(), false, esWitherBirth, this); } - m_InvulnerableTicks = NewTicks; + m_WitherInvulnerableTicks = NewTicks; if ((NewTicks % 10) == 0) { |