Paper/CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch
2015-03-08 05:03:38 -05:00

32 lines
1.1 KiB
Diff

From 0a80ce27e21076db3864895bcc265dc7360e2de4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 16 Apr 2014 01:40:30 -0400
Subject: [PATCH] Convert Horses owner to UUID
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index 272028f..688099f 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -1016,6 +1016,17 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
s = nbttagcompound.getString("OwnerUUID");
} else {
String s1 = nbttagcompound.getString("Owner");
+ // Spigot start
+ if ( s1 == null || s1.isEmpty() )
+ {
+ if (nbttagcompound.hasKey("OwnerName")) {
+ String owner = nbttagcompound.getString("OwnerName");
+ if (owner != null && !owner.isEmpty()) {
+ s1 = owner;
+ }
+ }
+ }
+ // Spigot end
s = NameReferencingFileConverter.a(s1);
}
--
2.1.0