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

Fixed 1.4.6 falling blocks.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1109 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-12-27 07:15:26 +00:00
parent 025cdfb201
commit 01e4d0bd05
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/Protocol/Protocol14x.cpp
View File

@ -188,7 +188,7 @@ void cProtocol146::SendPickupSpawn(const cPickup & a_Pickup)
void cProtocol146::SendSpawnFallingBlock(const cFallingBlock & a_FallingBlock) void cProtocol146::SendSpawnFallingBlock(const cFallingBlock & a_FallingBlock)
{ {
// Send two packets - spawn object, then entity metadata // Send a spawn object / vehicle packet
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_SPAWN_OBJECT); WriteByte(PACKET_SPAWN_OBJECT);
@ -197,20 +197,12 @@ void cProtocol146::SendSpawnFallingBlock(const cFallingBlock & a_FallingBlock)
WriteInt ((int)(a_FallingBlock.GetPosX() * 32)); WriteInt ((int)(a_FallingBlock.GetPosX() * 32));
WriteInt ((int)(a_FallingBlock.GetPosY() * 32)); WriteInt ((int)(a_FallingBlock.GetPosY() * 32));
WriteInt ((int)(a_FallingBlock.GetPosZ() * 32)); WriteInt ((int)(a_FallingBlock.GetPosZ() * 32));
WriteInt (0x800000); WriteByte (0); // Yaw
WriteShort(0); WriteByte (0); // Pitch
WriteShort(0); WriteInt (a_FallingBlock.GetBlockType()); // data indicator = blocktype
WriteShort(0); WriteShort(0); // SpeedX
WriteByte (0); WriteShort(0); // SpeedY
WriteByte (0); WriteShort(0); // SpeedZ
// TODO: This still doesn't work, although it is exactly the same that the vanilla server sends. WTF?
WriteByte(PACKET_ENTITY_METADATA);
WriteInt(a_FallingBlock.GetUniqueID());
WriteByte(0xaa); // a slot value at index 10
cItem Item(a_FallingBlock.GetBlockType(), 1);
WriteItem(Item);
WriteByte(0x7f); // End of metadata
Flush(); Flush();
} }