Minecraft 1.9.4

1 files changed, 19 insertions, 19 deletions

diff --git a/nms-patches/EntityHorse.patch b/nms-patches/EntityHorse.patch
index 6030f31b..0e047ddc 100644
--- a/nms-patches/EntityHorse.patch
+++ b/nms-patches/EntityHorse.patch
@@ -1,32 +1,32 @@
 --- a/net/minecraft/server/EntityHorse.java
 +++ b/net/minecraft/server/EntityHorse.java
-@@ -6,6 +6,8 @@
- import java.util.List;
+@@ -7,6 +7,8 @@
  import java.util.UUID;
+ import javax.annotation.Nullable;
  
 +import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; // CraftBukkit
 +
  public class EntityHorse extends EntityAnimal implements IInventoryListener, IJumpable {
  
-     private static final Predicate<Entity> bB = new Predicate() {
-@@ -52,6 +54,7 @@
-     private String cd;
-     private String[] ce = new String[3];
-     private boolean cf = false;
+     private static final Predicate<Entity> bC = new Predicate() {
+@@ -53,6 +55,7 @@
+     private String ce;
+     private String[] cf = new String[3];
+     private boolean cg = false;
 +    public int maxDomestication = 100; // CraftBukkit - store max domestication value
  
      public EntityHorse(World world) {
          super(world);
-@@ -318,7 +321,7 @@
+@@ -321,7 +324,7 @@
      public void loadChest() {
          InventoryHorseChest inventoryhorsechest = this.inventoryChest;
  
--        this.inventoryChest = new InventoryHorseChest("HorseChest", this.dI());
-+        this.inventoryChest = new InventoryHorseChest("HorseChest", this.dI(), this); // CraftBukkit
+-        this.inventoryChest = new InventoryHorseChest("HorseChest", this.dJ());
++        this.inventoryChest = new InventoryHorseChest("HorseChest", this.dJ(), this); // CraftBukkit
          this.inventoryChest.a(this.getName());
          if (inventoryhorsechest != null) {
              inventoryhorsechest.b(this);
-@@ -470,7 +473,7 @@
+@@ -474,7 +477,7 @@
      }
  
      public int getMaxDomestication() {
@@ -34,8 +34,8 @@
 +        return this.maxDomestication; // CraftBukkit - return stored max domestication instead of 100
      }
  
-     protected float cd() {
-@@ -560,7 +563,7 @@
+     protected float ce() {
+@@ -564,7 +567,7 @@
                      }
  
                      if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
@@ -44,7 +44,7 @@
                          flag = true;
                      }
  
-@@ -651,11 +654,11 @@
+@@ -655,11 +658,11 @@
      }
  
      public void die(DamageSource damagesource) {
@@ -58,7 +58,7 @@
      }
  
      public void n() {
-@@ -666,7 +669,7 @@
+@@ -670,7 +673,7 @@
          super.n();
          if (!this.world.isClientSide) {
              if (this.random.nextInt(900) == 0 && this.deathTicks == 0) {
@@ -66,8 +66,8 @@
 +                this.heal(1.0F, RegainReason.REGEN); // CraftBukkit
              }
  
-             if (!this.dm() && !this.isVehicle() && this.random.nextInt(300) == 0 && this.world.getType(new BlockPosition(MathHelper.floor(this.locX), MathHelper.floor(this.locY) - 1, MathHelper.floor(this.locZ))).getBlock() == Blocks.GRASS) {
-@@ -919,6 +922,7 @@
+             if (!this.dn() && !this.isVehicle() && this.random.nextInt(300) == 0 && this.world.getType(new BlockPosition(MathHelper.floor(this.locX), MathHelper.floor(this.locY) - 1, MathHelper.floor(this.locZ))).getBlock() == Blocks.GRASS) {
+@@ -921,6 +924,7 @@
          if (this.getOwnerUUID() != null) {
              nbttagcompound.setString("OwnerUUID", this.getOwnerUUID().toString());
          }
@@ -75,7 +75,7 @@
  
          if (this.hasChest()) {
              NBTTagList nbttaglist = new NBTTagList();
-@@ -974,6 +978,12 @@
+@@ -976,6 +980,12 @@
              this.setOwnerUUID(UUID.fromString(s));
          }
  
@@ -88,7 +88,7 @@
          AttributeInstance attributeinstance = this.getAttributeMap().a("Speed");
  
          if (attributeinstance != null) {
-@@ -1145,6 +1155,18 @@
+@@ -1148,6 +1158,18 @@
      }
  
      public void b(int i) {