Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.8

Browse Source
This commit is contained in:
Travis Watkins
2014-04-10 20:04:38 -05:00
parent 0df7555cec
commit 8f771c7378
50 changed files with 1875 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minecraft/server/EntityHorse.java
View File

@@ -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")) {