mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From c5b397574e20d8b346fd1ebb52d3a6b53dd83b5b 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 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
|
|
|