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

Rename spawn chicken method, Initialize m_HasTeleported.

Browse Source
This commit is contained in:
archshift 2014-04-25 05:39:35 -07:00
parent ec9787bae2
commit cb7f1ee4bb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Entities/ProjectileEntity.cpp
View File

@ -440,6 +440,7 @@ cArrowEntity::cArrowEntity(cPlayer & a_Player, double a_Force) :
m_IsCritical((a_Force >= 1)), m_IsCritical((a_Force >= 1)),
m_Timer(0), m_Timer(0),
m_HitGroundTimer(0), m_HitGroundTimer(0),
m_HasTeleported(false),
m_bIsCollected(false), m_bIsCollected(false),
m_HitBlockPos(0, 0, 0) m_HitBlockPos(0, 0, 0)
{ {
@ -611,7 +612,7 @@ cThrownEggEntity::cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y,
void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
{ {
TryForChicken(a_HitPos); TrySpawnChicken(a_HitPos);
Destroy(); Destroy();
} }
@ -625,7 +626,7 @@ void cThrownEggEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hit
int TotalDamage = 0; int TotalDamage = 0;
// TODO: If entity is Ender Crystal, destroy it // TODO: If entity is Ender Crystal, destroy it
TryForChicken(a_HitPos); TrySpawnChicken(a_HitPos);
a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1); a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
Destroy(true); Destroy(true);
@ -635,7 +636,7 @@ void cThrownEggEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hit
void cThrownEggEntity::TryForChicken(const Vector3d & a_HitPos) void cThrownEggEntity::TrySpawnChicken(const Vector3d & a_HitPos)
{ {
if (m_World->GetTickRandomNumber(7) == 1) if (m_World->GetTickRandomNumber(7) == 1)
{ {

2
src/Entities/ProjectileEntity.h
View File

@ -210,7 +210,7 @@ protected:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
void TryForChicken(const Vector3d & a_HitPos); void TrySpawnChicken(const Vector3d & a_HitPos);
// tolua_begin // tolua_begin