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

Merge branch 'master' into itemframes

Browse Source 
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
This commit is contained in:
Tiger Wang
2014-02-18 22:13:44 +00:00
parent 08229956ff 98332c5b76
commit a686656253
30 changed files with 503 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Protocol/Protocol17x.cpp
View File

@@ -21,6 +21,7 @@ Implements the 1.7.x protocol classes:
#include "../Entities/ExpOrb.h"
#include "../Entities/Minecart.h"
#include "../Entities/FallingBlock.h"
#include "../Entities/Painting.h"
#include "../Entities/Pickup.h"
#include "../Entities/Player.h"
#include "../Entities/ItemFrame.h"
@@ -570,6 +571,20 @@ void cProtocol172::SendLogin(const cPlayer & a_Player, const cWorld & a_World)
void cProtocol172::SendPaintingSpawn(const cPainting & a_Painting)
{
cPacketizer Pkt(*this, 0x10); // Spawn Painting packet
Pkt.WriteVarInt(a_Painting.GetUniqueID());
Pkt.WriteString(a_Painting.GetName().c_str());
Pkt.WriteInt((int)a_Painting.GetPosX());
Pkt.WriteInt((int)a_Painting.GetPosY());
Pkt.WriteInt((int)a_Painting.GetPosZ());
Pkt.WriteInt(a_Painting.GetDirection());
}
void cProtocol172::SendPickupSpawn(const cPickup & a_Pickup)
{