1 files changed, 1 insertions, 54 deletions

diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index b4c162e35..d7e1f56a7 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -15,6 +15,7 @@
 
 #include "ProjectileArrow.h"
 #include "ProjectileEgg.h"
+#include "ProjectileEnderPearl.h"
 
 
 
@@ -410,60 +411,6 @@ void cProjectileEntity::CollectedBy(cPlayer * a_Dest)
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cThrownEnderPearlEntity :
-
-cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-	super(pkEnderPearl, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
-{
-	SetSpeed(a_Speed);
-}
-
-
-
-
-
-void cThrownEnderPearlEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
-{
-	// TODO: Tweak a_HitPos based on block face.
-	TeleportCreator(a_HitPos);
-	
-	Destroy();
-}
-
-
-
-
-
-void cThrownEnderPearlEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
-{
-	int TotalDamage = 0;
-	// TODO: If entity is Ender Crystal, destroy it
-	
-	TeleportCreator(a_HitPos);
-	a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
-	
-	Destroy(true);
-}
-
-
-
-
-
-void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos)
-{
-	// Teleport the creator here, make them take 5 damage:
-	if (m_Creator != NULL)
-	{
-		m_Creator->TeleportToCoords(a_HitPos.x + 0.5, a_HitPos.y + 1.7, a_HitPos.z + 0.5);
-		m_Creator->TakeDamage(dtEnderPearl, this, 5, 0);
-	}
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cThrownSnowballEntity :
 
 cThrownSnowballEntity::cThrownSnowballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :