summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Mobs/Wither.cpp29
-rw-r--r--src/Mobs/Wither.h7
2 files changed, 10 insertions, 26 deletions
diff --git a/src/Mobs/Wither.cpp b/src/Mobs/Wither.cpp
index 5b6e895e1..fe4dbb28b 100644
--- a/src/Mobs/Wither.cpp
+++ b/src/Mobs/Wither.cpp
@@ -10,9 +10,10 @@
cWither::cWither(void) :
super("Wither", mtWither, "mob.wither.hurt", "mob.wither.death", 0.9, 4.0),
- m_WitherInvulnerableTicks(220)
+ m_IsSpawnInvulnerable(true)
{
SetMaxHealth(300);
+ SetInvulnerableTicks(220);
}
@@ -47,11 +48,6 @@ bool cWither::DoTakeDamage(TakeDamageInfo & a_TDI)
return false;
}
- if (m_WitherInvulnerableTicks > 0)
- {
- return false;
- }
-
if (IsArmored() && (a_TDI.DamageType == dtRangedAttack))
{
return false;
@@ -68,21 +64,14 @@ void cWither::Tick(float a_Dt, cChunk & a_Chunk)
{
super::Tick(a_Dt, a_Chunk);
- if (m_WitherInvulnerableTicks > 0)
+ if (GetInvulnerableTicks() <= 0 && m_IsSpawnInvulnerable)
{
- unsigned int NewTicks = m_WitherInvulnerableTicks - 1;
-
- if (NewTicks == 0)
- {
- m_World->DoExplosionAt(7.0, GetPosX(), GetPosY(), GetPosZ(), false, esWitherBirth, this);
- }
-
- m_WitherInvulnerableTicks = NewTicks;
-
- if ((NewTicks % 10) == 0)
- {
- Heal(10);
- }
+ m_World->DoExplosionAt(7.0, GetPosX(), GetPosY(), GetPosZ(), false, esWitherBirth, this);
+ m_IsSpawnInvulnerable = false;
+ }
+ else if (((GetInvulnerableTicks() % 10) == 0) && (GetInvulnerableTicks() > 10))
+ {
+ Heal(10);
}
m_World->BroadcastEntityMetadata(*this);
diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h
index 08b460009..81c9df1b1 100644
--- a/src/Mobs/Wither.h
+++ b/src/Mobs/Wither.h
@@ -17,10 +17,6 @@ public:
CLASS_PROTODEF(cWither);
- unsigned int GetWitherInvulnerableTicks(void) const { return m_WitherInvulnerableTicks; }
-
- void SetWitherInvulnerableTicks(unsigned int a_Ticks) { m_WitherInvulnerableTicks = a_Ticks; }
-
/** Returns whether the wither is invulnerable to arrows. */
bool IsArmored(void) const;
@@ -32,8 +28,7 @@ public:
private:
- /** The number of ticks of invulnerability left after being initially created. Zero once invulnerability has expired. */
- unsigned int m_WitherInvulnerableTicks;
+ bool m_IsSpawnInvulnerable;
} ;