diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-02-19 14:45:09 +0100 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-02-19 14:45:09 +0100 |
commit | d63ce62f3bbe4b8e89b8c54af4b71d77bcc7e052 (patch) | |
tree | e2a6645283f80bd664a4bc8d402f52f13824cd14 /src/Protocol | |
parent | Add break to Protocol17x.cpp and use new comment delimiter (diff) | |
download | cuberite-d63ce62f3bbe4b8e89b8c54af4b71d77bcc7e052.tar cuberite-d63ce62f3bbe4b8e89b8c54af4b71d77bcc7e052.tar.gz cuberite-d63ce62f3bbe4b8e89b8c54af4b71d77bcc7e052.tar.bz2 cuberite-d63ce62f3bbe4b8e89b8c54af4b71d77bcc7e052.tar.lz cuberite-d63ce62f3bbe4b8e89b8c54af4b71d77bcc7e052.tar.xz cuberite-d63ce62f3bbe4b8e89b8c54af4b71d77bcc7e052.tar.zst cuberite-d63ce62f3bbe4b8e89b8c54af4b71d77bcc7e052.zip |
Diffstat (limited to 'src/Protocol')
-rw-r--r-- | src/Protocol/Protocol17x.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index 07b23e0ac..344dcc676 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -26,7 +26,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" @@ -1043,7 +1043,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); @@ -2273,14 +2273,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; } |