diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-08-25 14:43:18 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2017-08-25 14:43:18 +0200 |
| commit | f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7 (patch) | |
| tree | 70139b1ad7ed221e4b75c3a9e247b337de68eb07 /src/WorldStorage/NBTChunkSerializer.cpp | |
| parent | compile.sh update. Fixed -d and -n, intelligent thread choice (#3960) (diff) | |
| download | cuberite-f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7.tar cuberite-f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7.tar.gz cuberite-f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7.tar.bz2 cuberite-f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7.tar.lz cuberite-f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7.tar.xz cuberite-f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7.tar.zst cuberite-f4f2fc7c3d76eb3dc5a91c5eefb36c10597d6cb7.zip | |
Diffstat (limited to 'src/WorldStorage/NBTChunkSerializer.cpp')
| -rw-r--r-- | src/WorldStorage/NBTChunkSerializer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
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()); |