Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-05-27 17:40:02 +10:00
parent 955a0fb081
commit 23c4e709bc
10 changed files with 65 additions and 34 deletions

View File

@@ -1,14 +1,14 @@
From ecd3b9da7c4b9813bfe22dbbca61acbb5a17c83f Mon Sep 17 00:00:00 2001
From 2edcc188acc78287943dc579ce423f2e546ce559 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 7d67210..6104597 100644
index 544c008..f2a1cb3 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -1001,6 +1001,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
@@ -1014,6 +1014,14 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
if (nbttagcompound.hasKeyOfType("OwnerUUID", 8)) {
this.setOwnerUUID(nbttagcompound.getString("OwnerUUID"));
}