testserver/CraftBukkit-Patches/0108-Convert-Horses-owner-t...

32 lines
1.1 KiB
Diff
Raw Normal View History

2015-04-09 03:41:04 +00:00
From b2e969a74acdb2012fa3126d7ca404657b07fe88 Mon Sep 17 00:00:00 2001
2014-11-28 01:17:45 +00: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
2015-02-28 11:36:22 +00:00
index 272028f..688099f 100644
2014-11-28 01:17:45 +00:00
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
2015-02-28 11:36:22 +00:00
@@ -1016,6 +1016,17 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
2014-11-28 01:17:45 +00:00
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
2014-11-28 01:17:45 +00:00