2014-11-29 01:06:26 +01:00
|
|
|
From dbaaa91dec68aed24f7c5e7e4fd1b287c835e338 Mon Sep 17 00:00:00 2001
|
2014-11-28 02:17:45 +01:00
|
|
|
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 b3ad7e7..50e9292 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHorse.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
|
|
|
|
|
@@ -1010,6 +1010,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
|
|
|
|
|
|
