summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol17x.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-02-19 14:45:09 +0100
committerTheJumper <maximilian.springer@web.de>2014-02-23 19:50:50 +0100
commit1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b (patch)
tree617bf18a768a493c2cd428297168f57df0901c26 /src/Protocol/Protocol17x.cpp
parentAdd break to Protocol17x.cpp and use new comment delimiter (diff)
downloadcuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar
cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.gz
cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.bz2
cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.lz
cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.xz
cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.zst
cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol17x.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 5508c2cfe..aaf8830cd 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -28,7 +28,7 @@ Implements the 1.7.x protocol classes:
#include "../Mobs/IncludeAllMonsters.h"
#include "../UI/Window.h"
#include "../BlockEntities/CommandBlockEntity.h"
-#include "../BlockEntities/SkullEntity.h"
+#include "../BlockEntities/MobHeadEntity.h"
#include "../CompositeChat.h"
@@ -1059,7 +1059,7 @@ void cProtocol172::SendUpdateBlockEntity(cBlockEntity & a_BlockEntity)
{
case E_BLOCK_MOB_SPAWNER: Action = 1; break; // Update mob spawner spinny mob thing
case E_BLOCK_COMMAND_BLOCK: Action = 2; break; // Update command block text
- case E_BLOCK_HEAD: Action = 4; break; // Update Skull entity
+ case E_BLOCK_HEAD: Action = 4; break; // Update Mobhead entity
default: ASSERT(!"Unhandled or unimplemented BlockEntity update request!"); break;
}
Pkt.WriteByte(Action);
@@ -2289,14 +2289,14 @@ void cProtocol172::cPacketizer::WriteBlockEntity(const cBlockEntity & a_BlockEnt
}
case E_BLOCK_HEAD:
{
- cSkullEntity & SkullEntity = (cSkullEntity &)a_BlockEntity;
+ cMobHeadEntity & MobHeadEntity = (cMobHeadEntity &)a_BlockEntity;
- Writer.AddInt("x", SkullEntity.GetPosX());
- Writer.AddInt("y", SkullEntity.GetPosY());
- Writer.AddInt("z", SkullEntity.GetPosZ());
- Writer.AddByte("SkullType", SkullEntity.GetSkullType() & 0xFF);
- Writer.AddByte("Rot", SkullEntity.GetRotation() & 0xFF);
- Writer.AddString("ExtraType", SkullEntity.GetOwner().c_str());
+ Writer.AddInt("x", MobHeadEntity.GetPosX());
+ Writer.AddInt("y", MobHeadEntity.GetPosY());
+ Writer.AddInt("z", MobHeadEntity.GetPosZ());
+ Writer.AddByte("SkullType", MobHeadEntity.GetType() & 0xFF);
+ Writer.AddByte("Rot", MobHeadEntity.GetRotation() & 0xFF);
+ Writer.AddString("ExtraType", MobHeadEntity.GetOwner().c_str());
Writer.AddString("id", "Skull"); // "Tile Entity ID" - MC wiki; vanilla server always seems to send this though
break;
}