flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Withers now use the new invulnerable.

Browse Source
This commit is contained in:
Howaner 2014-04-26 17:37:35 +02:00
parent 49f6819829
commit 619592b5a0
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Mobs/Wither.cpp
View File

@ -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);

7
src/Mobs/Wither.h
View File

@ -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;
} ;