diff options
author | archshift <admin@archshift.com> | 2014-04-27 02:02:47 +0200 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-04-27 02:02:47 +0200 |
commit | de23a115a5a33a864111262f4dae08b524af422f (patch) | |
tree | 3dadd44a4ddd905ae8cadcdf39619e312744ff6e /src/Entities/ProjectileEntity.cpp | |
parent | Moved cArrowEntity out of ProjectileEntity.h (diff) | |
download | cuberite-de23a115a5a33a864111262f4dae08b524af422f.tar cuberite-de23a115a5a33a864111262f4dae08b524af422f.tar.gz cuberite-de23a115a5a33a864111262f4dae08b524af422f.tar.bz2 cuberite-de23a115a5a33a864111262f4dae08b524af422f.tar.lz cuberite-de23a115a5a33a864111262f4dae08b524af422f.tar.xz cuberite-de23a115a5a33a864111262f4dae08b524af422f.tar.zst cuberite-de23a115a5a33a864111262f4dae08b524af422f.zip |
Diffstat (limited to 'src/Entities/ProjectileEntity.cpp')
-rw-r--r-- | src/Entities/ProjectileEntity.cpp | 59 |
1 files changed, 1 insertions, 58 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index 079adcc5f..b4c162e35 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -14,6 +14,7 @@ #include "../Chunk.h" #include "ProjectileArrow.h" +#include "ProjectileEgg.h" @@ -409,64 +410,6 @@ void cProjectileEntity::CollectedBy(cPlayer * a_Dest) /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// cThrownEggEntity: - -cThrownEggEntity::cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : - super(pkEgg, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) -{ - SetSpeed(a_Speed); -} - - - - - -void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) -{ - TrySpawnChicken(a_HitPos); - - Destroy(); -} - - - - - -void cThrownEggEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) -{ - int TotalDamage = 0; - // TODO: If entity is Ender Crystal, destroy it - - TrySpawnChicken(a_HitPos); - a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1); - - Destroy(true); -} - - - - - -void cThrownEggEntity::TrySpawnChicken(const Vector3d & a_HitPos) -{ - if (m_World->GetTickRandomNumber(7) == 1) - { - m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken); - } - else if (m_World->GetTickRandomNumber(32) == 1) - { - m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken); - m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken); - m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken); - m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken); - } -} - - - - - -/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // cThrownEnderPearlEntity : cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : |