From f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Fri, 25 Aug 2017 13:43:18 +0100 Subject: Add cUUID class (#3871) --- src/WorldStorage/NBTChunkSerializer.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/WorldStorage/NBTChunkSerializer.cpp') diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index 8c60aac0d..73c633e1a 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -7,6 +7,7 @@ #include "EnchantmentSerializer.h" #include "../ItemGrid.h" #include "../StringCompression.h" +#include "../UUID.h" #include "FastNBT.h" #include "../BlockEntities/BeaconEntity.h" @@ -382,7 +383,7 @@ void cNBTChunkSerializer::AddMobHeadEntity(cMobHeadEntity * a_MobHead) // The new Block Entity format for a Mob Head. See: https://minecraft.gamepedia.com/Head#Block_entity m_Writer.BeginCompound("Owner"); - m_Writer.AddString("Id", a_MobHead->GetOwnerUUID()); + m_Writer.AddString("Id", a_MobHead->GetOwnerUUID().ToShortString()); m_Writer.AddString("Name", a_MobHead->GetOwnerName()); m_Writer.BeginCompound("Properties"); m_Writer.BeginList("textures", TAG_Compound); @@ -679,9 +680,9 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) { m_Writer.AddString("Owner", Wolf->GetOwnerName()); } - if (!Wolf->GetOwnerUUID().empty()) + if (!Wolf->GetOwnerUUID().IsNil()) { - m_Writer.AddString("OwnerUUID", Wolf->GetOwnerUUID()); + m_Writer.AddString("OwnerUUID", Wolf->GetOwnerUUID().ToShortString()); } m_Writer.AddByte("Sitting", Wolf->IsSitting() ? 1 : 0); m_Writer.AddByte("Angry", Wolf->IsAngry() ? 1 : 0); @@ -709,9 +710,9 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster) { m_Writer.AddString("Owner", Ocelot->GetOwnerName()); } - if (!Ocelot->GetOwnerUUID().empty()) + if (!Ocelot->GetOwnerUUID().IsNil()) { - m_Writer.AddString("OwnerUUID", Ocelot->GetOwnerUUID()); + m_Writer.AddString("OwnerUUID", Ocelot->GetOwnerUUID().ToShortString()); } m_Writer.AddByte("Sitting", Ocelot->IsSitting() ? 1 : 0); m_Writer.AddInt ("CatType", Ocelot->GetOcelotType()); -- cgit v1.2.3