1 files changed, 1 insertions, 71 deletions

diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 3a5ac059b..4784d4b0c 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -19,6 +19,7 @@
 #include "ProjectileExpBottle.h"
 #include "ProjectileSnowball.h"
 #include "ProjectileFireCharge.h"
+#include "ProjectileFirework.h"
 #include "ProjectileGhastFireball.h"
 
 
@@ -408,75 +409,4 @@ void cProjectileEntity::CollectedBy(cPlayer * a_Dest)
 {
 	// Overriden in arrow
 	UNUSED(a_Dest);
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cFireworkEntity :
-
-cFireworkEntity::cFireworkEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const cItem & a_Item) :
-super(pkFirework, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
-	m_ExplodeTimer(0),
-	m_FireworkItem(a_Item)
-{
-}
-
-
-
-
-
-void cFireworkEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
-{
-	int RelX = POSX_TOINT - a_Chunk.GetPosX() * cChunkDef::Width;
-	int RelZ = POSZ_TOINT - a_Chunk.GetPosZ() * cChunkDef::Width;
-	int PosY = POSY_TOINT;
-
-	if ((PosY < 0) || (PosY >= cChunkDef::Height))
-	{
-		goto setspeed;
-	}
-
-	if (m_IsInGround)
-	{
-		if (a_Chunk.GetBlock(RelX, POSY_TOINT + 1, RelZ) == E_BLOCK_AIR)
-		{
-			m_IsInGround = false;
-		}
-		else
-		{
-			return;
-		}
-	}
-	else
-	{
-		if (a_Chunk.GetBlock(RelX, POSY_TOINT + 1, RelZ) != E_BLOCK_AIR)
-		{
-			OnHitSolidBlock(GetPosition(), BLOCK_FACE_YM);
-			return;
-		}
-	}
-
-setspeed:
-	AddSpeedY(1);
-	AddPosition(GetSpeed() * (a_Dt / 1000));
-}
-
-
-
-
-
-void cFireworkEntity::Tick(float a_Dt, cChunk & a_Chunk)
-{
-	super::Tick(a_Dt, a_Chunk);
-
-	if (m_ExplodeTimer == m_FireworkItem.m_FireworkItem.m_FlightTimeInTicks)
-	{
-		m_World->BroadcastEntityStatus(*this, esFireworkExploding);
-		Destroy();
-	}
-
-	m_ExplodeTimer++;
 }
\ No newline at end of file