summaryrefslogtreecommitdiffstats
path: root/src/Protocol
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-02-18 23:21:05 +0100
committerMattes D <github@xoft.cz>2014-02-18 23:21:05 +0100
commit1d9b02c95686d0fd90431b5c78999eaf96b5991c (patch)
tree112663e0d7be31401232bd6e3f4f10852776639e /src/Protocol
parentMerge pull request #696 from mc-server/paintings (diff)
parentMerge branch 'master' into itemframes (diff)
downloadcuberite-1d9b02c95686d0fd90431b5c78999eaf96b5991c.tar
cuberite-1d9b02c95686d0fd90431b5c78999eaf96b5991c.tar.gz
cuberite-1d9b02c95686d0fd90431b5c78999eaf96b5991c.tar.bz2
cuberite-1d9b02c95686d0fd90431b5c78999eaf96b5991c.tar.lz
cuberite-1d9b02c95686d0fd90431b5c78999eaf96b5991c.tar.xz
cuberite-1d9b02c95686d0fd90431b5c78999eaf96b5991c.tar.zst
cuberite-1d9b02c95686d0fd90431b5c78999eaf96b5991c.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol17x.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 7da19a14b..0c569c07c 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -24,6 +24,7 @@ Implements the 1.7.x protocol classes:
#include "../Entities/Painting.h"
#include "../Entities/Pickup.h"
#include "../Entities/Player.h"
+#include "../Entities/ItemFrame.h"
#include "../Mobs/IncludeAllMonsters.h"
#include "../UI/Window.h"
#include "../BlockEntities/CommandBlockEntity.h"
@@ -938,8 +939,8 @@ void cProtocol172::SendSpawnObject(const cEntity & a_Entity, char a_ObjectType,
Pkt.WriteFPInt(a_Entity.GetPosX());
Pkt.WriteFPInt(a_Entity.GetPosY());
Pkt.WriteFPInt(a_Entity.GetPosZ());
- Pkt.WriteByteAngle(a_Entity.GetYaw());
Pkt.WriteByteAngle(a_Entity.GetPitch());
+ Pkt.WriteByteAngle(a_Entity.GetYaw());
Pkt.WriteInt(a_ObjectData);
if (a_ObjectData != 0)
{
@@ -961,8 +962,8 @@ void cProtocol172::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleTyp
Pkt.WriteFPInt(a_Vehicle.GetPosX());
Pkt.WriteFPInt(a_Vehicle.GetPosY());
Pkt.WriteFPInt(a_Vehicle.GetPosZ());
- Pkt.WriteByteAngle(a_Vehicle.GetYaw());
Pkt.WriteByteAngle(a_Vehicle.GetPitch());
+ Pkt.WriteByteAngle(a_Vehicle.GetYaw());
Pkt.WriteInt(a_VehicleSubType);
if (a_VehicleSubType != 0)
{
@@ -2406,6 +2407,15 @@ void cProtocol172::cPacketizer::WriteEntityMetadata(const cEntity & a_Entity)
WriteMobMetadata((const cMonster &)a_Entity);
break;
}
+ case cEntity::etItemFrame:
+ {
+ cItemFrame & Frame = (cItemFrame &)a_Entity;
+ WriteByte(0xA2);
+ WriteItem(Frame.GetItem());
+ WriteByte(0x3);
+ WriteByte(Frame.GetRotation());
+ break;
+ }
}
}