Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-18 17:08:19 +00:00
parent 1f1443ed34
commit 804a818172
17 changed files with 84 additions and 87 deletions

View File

@@ -1,14 +1,14 @@
From b10521c8fbd8be80380d7a0f625b20d4ad80e70e Mon Sep 17 00:00:00 2001
From 1441910574b7f650f36372c0c1321ce86c8f8958 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 5978ea3..1b1ed9b 100644
index 7d67210..6104597 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -1000,6 +1000,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
@@ -1001,6 +1001,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
if (nbttagcompound.hasKeyOfType("OwnerUUID", 8)) {
this.setOwnerUUID(nbttagcompound.getString("OwnerUUID"));
}
@@ -24,5 +24,5 @@ index 5978ea3..1b1ed9b 100644
if (nbttagcompound.hasKey("Bukkit.MaxDomestication")) {
this.maxDomestication = nbttagcompound.getInt("Bukkit.MaxDomestication");
--
1.8.5.2.msysgit.0
1.9.1