2 files changed, 30 insertions, 0 deletions
diff --git a/src/Mobs/Wither.cpp b/src/Mobs/Wither.cpp
index 0e42194ac..8f5d28b68 100644
--- a/src/Mobs/Wither.cpp
+++ b/src/Mobs/Wither.cpp
@@ -13,8 +13,27 @@ cWither::cWither(void) :
 	m_InvulnerableTicks(220)
 {
 	SetMaxHealth(300);
+}
+
+
+
+
+
+bool cWither::IsArmored(void) const
+{
+	return GetHealth() <= (GetMaxHealth() / 2);
+}
+
+
 
+
+
+bool cWither::Initialize(cWorld * a_World)
+{
+	// Set health before BroadcastSpawnEntity()
 	SetHealth(GetMaxHealth() / 3);
+
+	return super::Initialize(a_World);
 }
 
 
@@ -33,6 +52,11 @@ void cWither::DoTakeDamage(TakeDamageInfo & a_TDI)
 		return;
 	}
 
+	if (IsArmored() && (a_TDI.DamageType == dtRangedAttack))
+	{
+		return;
+	}
+
 	super::DoTakeDamage(a_TDI);
 }
 
@@ -60,6 +84,8 @@ void cWither::Tick(float a_Dt, cChunk & a_Chunk)
 			Heal(10);
 		}
 	}
+
+	m_World->BroadcastEntityMetadata(*this);
 }
 
 
diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h
index d09e3607a..bc78bfaad 100644
--- a/src/Mobs/Wither.h
+++ b/src/Mobs/Wither.h
@@ -20,8 +20,12 @@ public:
 	unsigned int GetNumInvulnerableTicks(void) const { return m_InvulnerableTicks; }
 
 	void SetNumInvulnerableTicks(unsigned int a_Ticks) { m_InvulnerableTicks = a_Ticks; }
+
+	/** Returns whether the wither is invulnerable to arrows. */
+	bool IsArmored(void) const;
 	
 	// cEntity overrides
+	virtual bool Initialize(cWorld * a_World) override;
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;