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

Code improvements

Browse Source
This commit is contained in:
Howaner 2014-05-28 19:32:20 +02:00
parent 9f645b2c75
commit 142fa83124
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BlockEntities/MobHeadEntity.cpp
View File

@ -70,11 +70,8 @@ void cMobHeadEntity::SetOwner(const AString & a_Owner)
void cMobHeadEntity::SendTo(cClientHandle & a_Client) void cMobHeadEntity::SendTo(cClientHandle & a_Client)
{ {
BLOCKTYPE Block; cWorld * World = a_Client.GetPlayer()->GetWorld();
NIBBLETYPE Meta; a_Client.SendBlockChange(m_PosX, m_PosY, m_PosZ, m_BlockType, World->GetBlockMeta(m_PosX, m_PosY, m_PosZ));
a_Client.GetPlayer()->GetWorld()->GetBlockTypeMeta(m_PosX, m_PosY, m_PosZ, Block, Meta);
a_Client.SendBlockChange(m_PosX, m_PosY, m_PosZ, Block, Meta);
a_Client.SendUpdateBlockEntity(*this); a_Client.SendUpdateBlockEntity(*this);
} }

8
src/Blocks/BlockMobHead.h
View File

@ -19,7 +19,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{ {
// The drops spawns in OnDestroyed // The drop spawn is in OnDestroyed method
} }
virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
@ -51,11 +51,7 @@ public:
a_MobHeadEntity->GetWorld()->SpawnItemPickups(Pickups, MicroX, MicroY, MicroZ); a_MobHeadEntity->GetWorld()->SpawnItemPickups(Pickups, MicroX, MicroY, MicroZ);
return false; return false;
} }
} Callback;
public:
cCallback() {}
};
cCallback Callback;
cWorld * World = (cWorld *) &a_WorldInterface; cWorld * World = (cWorld *) &a_WorldInterface;
World->DoWithMobHeadAt(a_BlockX, a_BlockY, a_BlockZ, Callback); World->DoWithMobHeadAt(a_BlockX, a_BlockY, a_BlockZ, Callback);

1
src/WorldStorage/NBTChunkSerializer.cpp
View File

@ -609,7 +609,6 @@ void cNBTChunkSerializer::AddProjectileEntity(cProjectileEntity * a_Projectile)
{ {
m_Writer.AddInt("ExplosionPower", 1); m_Writer.AddInt("ExplosionPower", 1);
break; break;
// fall-through:
} }
case cProjectileEntity::pkFireCharge: case cProjectileEntity::pkFireCharge:
case cProjectileEntity::pkWitherSkull: case cProjectileEntity::pkWitherSkull: