diff options
Diffstat (limited to 'src/Mobs/Wither.cpp')
| -rw-r--r-- | src/Mobs/Wither.cpp | 95 |
1 files changed, 1 insertions, 94 deletions
diff --git a/src/Mobs/Wither.cpp b/src/Mobs/Wither.cpp index 578b47995..e996078dc 100644 --- a/src/Mobs/Wither.cpp +++ b/src/Mobs/Wither.cpp @@ -12,7 +12,7 @@ cWither::cWither(void) : super("Wither", mtWither, "mob.wither.hurt", "mob.wither.death", 0.9, 4.0), - m_WitherInvulnerableTicks(220) + m_WitherInvulnerableTicks(0) { SetMaxHealth(300); } @@ -21,15 +21,6 @@ cWither::cWither(void) : -bool cWither::IsArmored(void) const -{ - return GetHealth() <= (GetMaxHealth() / 2); -} - - - - - bool cWither::Initialize(cWorld & a_World) { // Set health before BroadcastSpawnEntity() @@ -42,58 +33,6 @@ bool cWither::Initialize(cWorld & a_World) -bool cWither::DoTakeDamage(TakeDamageInfo & a_TDI) -{ - if (a_TDI.DamageType == dtDrowning) - { - return false; - } - - if (m_WitherInvulnerableTicks > 0) - { - return false; - } - - if (IsArmored() && (a_TDI.DamageType == dtRangedAttack)) - { - return false; - } - - return super::DoTakeDamage(a_TDI); -} - - - - - -void cWither::Tick(float a_Dt, cChunk & a_Chunk) -{ - super::Tick(a_Dt, a_Chunk); - - if (m_WitherInvulnerableTicks > 0) - { - 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->BroadcastEntityMetadata(*this); -} - - - - - void cWither::GetDrops(cItems & a_Drops, cEntity * a_Killer) { AddRandomDropItem(a_Drops, 1, 1, E_ITEM_NETHER_STAR); @@ -102,35 +41,3 @@ void cWither::GetDrops(cItems & a_Drops, cEntity * a_Killer) - -void cWither::KilledBy(TakeDamageInfo & a_TDI) -{ - super::KilledBy(a_TDI); - - class cPlayerCallback : public cPlayerListCallback - { - Vector3f m_Pos; - - virtual bool Item(cPlayer * a_Player) - { - // TODO 2014-05-21 xdot: Vanilla minecraft uses an AABB check instead of a radius one - double Dist = (a_Player->GetPosition() - m_Pos).Length(); - if (Dist < 50.0) - { - // If player is close, award achievement - a_Player->AwardAchievement(achKillWither); - } - return false; - } - - public: - cPlayerCallback(const Vector3f & a_Pos) : m_Pos(a_Pos) {} - - } PlayerCallback(GetPosition()); - - m_World->ForEachPlayer(PlayerCallback); -} - - - - |