summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-09-23 22:16:05 +0200
committerHowaner <franzi.moos@googlemail.com>2014-09-23 22:16:05 +0200
commit2832685c021309200973e621e8caeff7a12078ae (patch)
tree29e2fb7e3dc4debd1dc1c563abd8c4779b80c452
parentMCServer world compatiblity with vanilla and mcedit. (diff)
parentFixed compiler warnings in 1.8 protocol. (diff)
downloadcuberite-2832685c021309200973e621e8caeff7a12078ae.tar
cuberite-2832685c021309200973e621e8caeff7a12078ae.tar.gz
cuberite-2832685c021309200973e621e8caeff7a12078ae.tar.bz2
cuberite-2832685c021309200973e621e8caeff7a12078ae.tar.lz
cuberite-2832685c021309200973e621e8caeff7a12078ae.tar.xz
cuberite-2832685c021309200973e621e8caeff7a12078ae.tar.zst
cuberite-2832685c021309200973e621e8caeff7a12078ae.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol18x.cpp4
-rw-r--r--src/WorldStorage/WSSAnvil.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Protocol/Protocol18x.cpp b/src/Protocol/Protocol18x.cpp
index e2ea6701a..f62d350fe 100644
--- a/src/Protocol/Protocol18x.cpp
+++ b/src/Protocol/Protocol18x.cpp
@@ -576,7 +576,7 @@ void cProtocol180::SendLogin(const cPlayer & a_Player, const cWorld & a_World)
// Send the spawn position:
{
cPacketizer Pkt(*this, 0x05); // Spawn Position packet
- Pkt.WritePosition(a_World.GetSpawnX(), a_World.GetSpawnY(), a_World.GetSpawnZ());
+ Pkt.WritePosition((int)a_World.GetSpawnX(), (int)a_World.GetSpawnY(), (int)a_World.GetSpawnZ());
}
// Send the server difficulty:
@@ -633,7 +633,7 @@ void cProtocol180::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.WritePosition(PosX, PosY, PosZ);
+ Pkt.WritePosition((int)PosX, (int)PosY, (int)PosZ);
Pkt.WriteChar(a_Painting.GetDirection());
}
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 8dc4088b7..62f5ef9c0 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -2493,19 +2493,19 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
LoadWolfOwner(*Monster.get(), a_NBT, a_TagIdx);
int SittingIdx = a_NBT.FindChildByName(a_TagIdx, "Sitting");
- if (SittingIdx > 0)
+ if ((SittingIdx > 0) && (a_NBT.GetType(SittingIdx) == TAG_Byte))
{
bool Sitting = ((a_NBT.GetByte(SittingIdx) == 1) ? true : false);
Monster->SetIsSitting(Sitting);
}
int AngryIdx = a_NBT.FindChildByName(a_TagIdx, "Angry");
- if (AngryIdx > 0)
+ if ((AngryIdx > 0) && (a_NBT.GetType(AngryIdx) == TAG_Byte))
{
bool Angry = ((a_NBT.GetByte(AngryIdx) == 1) ? true : false);
Monster->SetIsAngry(Angry);
}
int CollarColorIdx = a_NBT.FindChildByName(a_TagIdx, "CollarColor");
- if (CollarColorIdx > 0)
+ if ((CollarColorIdx > 0) && (a_NBT.GetType(CollarColorIdx) == TAG_Int))
{
int CollarColor = a_NBT.GetInt(CollarColorIdx);
Monster->SetCollarColor(CollarColor);