Moved entity spawning into cEntity::Initialize().
It has been called in every descendant anyway, so it's better this way - reduced duplicate code.
This commit is contained in:
parent
83811b6929
commit
a7447b4c7e
@ -144,6 +144,10 @@ bool cEntity::Initialize(cWorld * a_World)
|
|||||||
m_World->AddEntity(this);
|
m_World->AddEntity(this);
|
||||||
|
|
||||||
cPluginManager::Get()->CallHookSpawnedEntity(*a_World, *this);
|
cPluginManager::Get()->CallHookSpawnedEntity(*a_World, *this);
|
||||||
|
|
||||||
|
// Spawn the entity on the clients:
|
||||||
|
a_World->BroadcastSpawnEntity(*this);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,20 +22,6 @@ cFallingBlock::cFallingBlock(const Vector3i & a_BlockPosition, BLOCKTYPE a_Block
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool cFallingBlock::Initialize(cWorld * a_World)
|
|
||||||
{
|
|
||||||
if (super::Initialize(a_World))
|
|
||||||
{
|
|
||||||
a_World->BroadcastSpawnEntity(*this);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cFallingBlock::SpawnOn(cClientHandle & a_ClientHandle)
|
void cFallingBlock::SpawnOn(cClientHandle & a_ClientHandle)
|
||||||
{
|
{
|
||||||
a_ClientHandle.SendSpawnFallingBlock(*this);
|
a_ClientHandle.SendSpawnFallingBlock(*this);
|
||||||
|
@ -29,7 +29,6 @@ public:
|
|||||||
NIBBLETYPE GetBlockMeta(void) const { return m_BlockMeta; }
|
NIBBLETYPE GetBlockMeta(void) const { return m_BlockMeta; }
|
||||||
|
|
||||||
// cEntity overrides:
|
// cEntity overrides:
|
||||||
virtual bool Initialize(cWorld * a_World) override;
|
|
||||||
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
|
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
|
||||||
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
||||||
|
|
||||||
|
@ -22,20 +22,6 @@ cMinecart::cMinecart(ePayload a_Payload, double a_X, double a_Y, double a_Z) :
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool cMinecart::Initialize(cWorld * a_World)
|
|
||||||
{
|
|
||||||
if (super::Initialize(a_World))
|
|
||||||
{
|
|
||||||
a_World->BroadcastSpawnEntity(*this);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cMinecart::SpawnOn(cClientHandle & a_ClientHandle)
|
void cMinecart::SpawnOn(cClientHandle & a_ClientHandle)
|
||||||
{
|
{
|
||||||
char Type = 0;
|
char Type = 0;
|
||||||
|
@ -35,7 +35,6 @@ public:
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
// cEntity overrides:
|
// cEntity overrides:
|
||||||
virtual bool Initialize(cWorld * a_World) override;
|
|
||||||
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
|
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
|
||||||
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
||||||
|
|
||||||
|
@ -40,20 +40,6 @@ cPickup::cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool cPickup::Initialize(cWorld * a_World)
|
|
||||||
{
|
|
||||||
if (super::Initialize(a_World))
|
|
||||||
{
|
|
||||||
a_World->BroadcastSpawnEntity(*this);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cPickup::SpawnOn(cClientHandle & a_Client)
|
void cPickup::SpawnOn(cClientHandle & a_Client)
|
||||||
{
|
{
|
||||||
a_Client.SendPickupSpawn(*this);
|
a_Client.SendPickupSpawn(*this);
|
||||||
|
@ -26,8 +26,6 @@ public:
|
|||||||
|
|
||||||
cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem & a_Item, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); // tolua_export
|
cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem & a_Item, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); // tolua_export
|
||||||
|
|
||||||
virtual bool Initialize(cWorld * a_World) override;
|
|
||||||
|
|
||||||
cItem & GetItem(void) {return m_Item; } // tolua_export
|
cItem & GetItem(void) {return m_Item; } // tolua_export
|
||||||
const cItem & GetItem(void) const {return m_Item; }
|
const cItem & GetItem(void) const {return m_Item; }
|
||||||
|
|
||||||
|
@ -29,20 +29,6 @@ cTNTEntity::cTNTEntity(const Vector3d & a_Pos, double a_FuseTimeInSec) :
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool cTNTEntity::Initialize(cWorld * a_World)
|
|
||||||
{
|
|
||||||
if (super::Initialize(a_World))
|
|
||||||
{
|
|
||||||
a_World->BroadcastSpawnEntity(*this);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cTNTEntity::SpawnOn(cClientHandle & a_ClientHandle)
|
void cTNTEntity::SpawnOn(cClientHandle & a_ClientHandle)
|
||||||
{
|
{
|
||||||
a_ClientHandle.SendSpawnObject(*this, 50, 1, 0, 0); // 50 means TNT
|
a_ClientHandle.SendSpawnObject(*this, 50, 1, 0, 0); // 50 means TNT
|
||||||
|
@ -19,7 +19,6 @@ public:
|
|||||||
cTNTEntity(const Vector3d & a_Pos, double a_FuseTimeInSec);
|
cTNTEntity(const Vector3d & a_Pos, double a_FuseTimeInSec);
|
||||||
|
|
||||||
// cEntity overrides:
|
// cEntity overrides:
|
||||||
virtual bool Initialize(cWorld * a_World) override;
|
|
||||||
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
|
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
|
||||||
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user