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

29 lines
1.2 KiB
Diff
Raw Normal View History

2014-06-22 09:25:10 +00:00
From 9cb9051ba2b73b56c68fc6d45b8e53d772713fa5 Mon Sep 17 00:00:00 2001
2014-04-16 06:14:26 +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
2014-05-27 07:40:02 +00:00
index 544c008..f2a1cb3 100644
2014-04-16 06:14:26 +00:00
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
2014-05-27 07:40:02 +00:00
@@ -1014,6 +1014,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
2014-04-16 06:14:26 +00:00
if (nbttagcompound.hasKeyOfType("OwnerUUID", 8)) {
this.setOwnerUUID(nbttagcompound.getString("OwnerUUID"));
}
+ // Spigot start
+ else if (nbttagcompound.hasKey("OwnerName")) {
+ String owner = nbttagcompound.getString("OwnerName");
+ if (owner != null && !owner.isEmpty()) {
+ this.setOwnerUUID(NameReferencingFileConverter.a(owner));
+ }
+ }
+ // Spigot end
// CraftBukkit start
if (nbttagcompound.hasKey("Bukkit.MaxDomestication")) {
this.maxDomestication = nbttagcompound.getInt("Bukkit.MaxDomestication");
--
2014-04-18 17:08:19 +00:00
1.9.1
2014-04-16 06:14:26 +00:00