summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityHorse.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2014-04-10 20:04:38 -0500
committerTravis Watkins <amaranth@ubuntu.com>2014-04-11 22:28:35 -0500
commit8f771c737850130534b0fade70494f7ce3cbc8fd (patch)
treee4180121cdaf4f15b325aa059469b44975fca8a4 /src/main/java/net/minecraft/server/EntityHorse.java
parent0df7555cecff17ffab68b8280dcf8471b10f020c (diff)
downloadcraftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.tar
craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.tar.gz
craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.tar.lz
craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.tar.xz
craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.zip
Update CraftBukkit to Minecraft 1.7.8
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHorse.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityHorse.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index 30f25c3e..5978ea38 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -137,11 +137,11 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
return this.cb();
}
- public String getOwnerName() {
+ public String getOwnerUUID() {
return this.datawatcher.getString(21);
}
- public void setOwnerName(String s) {
+ public void setOwnerUUID(String s) {
this.datawatcher.watch(21, s);
}
@@ -875,7 +875,7 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
}
public boolean h(EntityHuman entityhuman) {
- this.setOwnerName(entityhuman.getName());
+ this.setOwnerUUID(entityhuman.getUniqueID().toString());
this.setTame(true);
return true;
}
@@ -958,7 +958,7 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
nbttagcompound.setInt("Variant", this.getVariant());
nbttagcompound.setInt("Temper", this.getTemper());
nbttagcompound.setBoolean("Tame", this.isTame());
- nbttagcompound.setString("OwnerName", this.getOwnerName());
+ nbttagcompound.setString("OwnerUUID", this.getOwnerUUID());
nbttagcompound.setInt("Bukkit.MaxDomestication", this.maxDomestication); // CraftBukkit
if (this.hasChest()) {
NBTTagList nbttaglist = new NBTTagList();
@@ -997,8 +997,8 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
this.setVariant(nbttagcompound.getInt("Variant"));
this.setTemper(nbttagcompound.getInt("Temper"));
this.setTame(nbttagcompound.getBoolean("Tame"));
- if (nbttagcompound.hasKeyOfType("OwnerName", 8)) {
- this.setOwnerName(nbttagcompound.getString("OwnerName"));
+ if (nbttagcompound.hasKeyOfType("OwnerUUID", 8)) {
+ this.setOwnerUUID(nbttagcompound.getString("OwnerUUID"));
}
// CraftBukkit start
if (nbttagcompound.hasKey("Bukkit.MaxDomestication")) {