Update to 1.8.4

2015-05-09 21:23:26 +01:00
parent a5b3760b6d
commit 80d0e8ffa7
156 changed files with 121 additions and 380 deletions
--- a/CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch
+++ b/CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
+@@ -0,0 +0,0 @@ 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);
+         }
+--