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

Merge pull request #2593 from cuberite/enderegg

Browse Source 
Destroy an ender crystal when hit by an egg.
This commit is contained in:
Julian Laubstein 2015-11-05 18:10:19 +01:00
commit 056822845d
2 changed files with 103 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Entity.h
View File

@ -93,7 +93,7 @@ public:
enum eEntityStatus enum eEntityStatus
{ {
// TODO: Investiagate 0, 1, and 5 as Wiki.vg is not certain // TODO: Investigate 0, 1, and 5 as Wiki.vg is not certain
// Entity becomes coloured red // Entity becomes coloured red
esGenericHurt = 2, esGenericHurt = 2,

13
src/Entities/ThrownEggEntity.cpp
View File

@ -32,7 +32,14 @@ void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_H
void cThrownEggEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) void cThrownEggEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
{ {
int TotalDamage = 0; int TotalDamage = 0;
// TODO: If entity is Ender Crystal, destroy it // If entity is an Ender Dragon or Ender Crystal, it is damaged.
if (
(a_EntityHit.IsMob() && (static_cast<cMonster &>(a_EntityHit).GetMobType() == mtEnderDragon)) ||
a_EntityHit.IsEnderCrystal()
)
{
TotalDamage = 1;
}
TrySpawnChicken(a_HitPos); TrySpawnChicken(a_HitPos);
a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1); a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
@ -79,3 +86,7 @@ void cThrownEggEntity::TrySpawnChicken(const Vector3d & a_HitPos)
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, mtChicken, false); m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, mtChicken, false);
} }
} }