summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage/WSSAnvil.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-08-04 12:02:57 +0200
committerMattes D <github@xoft.cz>2014-08-04 12:02:57 +0200
commit7b986e65d2b7d7cad6768599ba4298b62b16c35f (patch)
treedd627e5e467d4bf0f3ed47aa1201b6ab94e9c35a /src/WorldStorage/WSSAnvil.cpp
parentMerge pull request #1283 from Howaner/GlobalFixes (diff)
parentRefactored case-conversion functions. (diff)
downloadcuberite-7b986e65d2b7d7cad6768599ba4298b62b16c35f.tar
cuberite-7b986e65d2b7d7cad6768599ba4298b62b16c35f.tar.gz
cuberite-7b986e65d2b7d7cad6768599ba4298b62b16c35f.tar.bz2
cuberite-7b986e65d2b7d7cad6768599ba4298b62b16c35f.tar.lz
cuberite-7b986e65d2b7d7cad6768599ba4298b62b16c35f.tar.xz
cuberite-7b986e65d2b7d7cad6768599ba4298b62b16c35f.tar.zst
cuberite-7b986e65d2b7d7cad6768599ba4298b62b16c35f.zip
Diffstat (limited to 'src/WorldStorage/WSSAnvil.cpp')
-rw-r--r--src/WorldStorage/WSSAnvil.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 434f1e21f..a9c9ae4b5 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -2495,7 +2495,7 @@ void cWSSAnvil::LoadWolfOwner(cWolf & a_Wolf, const cParsedNBT & a_NBT, int a_Ta
int OwnerUUIDIdx = a_NBT.FindChildByName(a_TagIdx, "OwnerUUID");
if (OwnerUUIDIdx > 0)
{
- OwnerUUID = cMojangAPI::MakeUUIDShort(a_NBT.GetString(OwnerUUIDIdx));
+ OwnerUUID = a_NBT.GetString(OwnerUUIDIdx);
}
int OwnerIdx = a_NBT.FindChildByName(a_TagIdx, "Owner");
if (OwnerIdx > 0)
@@ -2520,6 +2520,11 @@ void cWSSAnvil::LoadWolfOwner(cWolf & a_Wolf, const cParsedNBT & a_NBT, int a_Ta
return;
}
}
+ else
+ {
+ // Normalize the UUID:
+ OwnerUUID = cMojangAPI::MakeUUIDShort(OwnerUUID);
+ }
// Convert UUID to name, if needed:
if (OwnerName.empty())