Rebuild patches

patches/server/0002-cows-to-mooshroom-when-fed-mushrooms.patch

@@ -1,4 +1,4 @@
-From 77b4e1d3418d77638669726c7b9bccb3325f28a1 Mon Sep 17 00:00:00 2001
+From 526b45ebd934832e19fd6b9091cb399f34e2c793 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -9,7 +9,7 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
  2 files changed, 45 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 23f910187..7bdc0f4a5 100644
+index 3d60b5c28..9834a8928 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -995,6 +995,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -21,7 +21,7 @@ index 23f910187..7bdc0f4a5 100644
          if (!this.isSilent()) {
              this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1);
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index d2c2e3cc3..0139688c7 100644
+index d2c2e3cc3..55169d564 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -16,7 +16,7 @@ public class EntityCow extends EntityAnimal {
@@ -64,8 +64,8 @@ index d2c2e3cc3..0139688c7 100644
 +            mooshroom.setHealth(this.getHealth());
 +            mooshroom.setAge(getAge());
 +            mooshroom.u(this);
-+            mooshroom.aQ = this.aQ;
++            mooshroom.aK = this.aK;
-+            mooshroom.aS = this.aS;
++            mooshroom.aM = this.aM;
 +            mooshroom.lastYaw = this.lastYaw;
 +            mooshroom.lastPitch = this.lastPitch;
 +            if (this.hasCustomName()) {

patches/server/0009-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From 73d1754370dbdf1b4819c96e880a047eee045610 Mon Sep 17 00:00:00 2001
+From 2f733e203b811f198f28e10bf8c98c3bb23ed07c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 30 Apr 2019 19:17:21 -0500
 Subject: [PATCH] Integrate ridables
@@ -9,7 +9,7 @@ Subject: [PATCH] Integrate ridables
  .../server/ControllerLookDolphin.java         |   4 +-
  .../java/net/minecraft/server/Entity.java     |  15 +-
  .../net/minecraft/server/EntityChicken.java   |  17 +-
- .../java/net/minecraft/server/EntityCow.java  |  20 +-
+ .../java/net/minecraft/server/EntityCow.java  |  16 +-
  .../net/minecraft/server/EntityCreeper.java   |  14 ++
  .../net/minecraft/server/EntityDolphin.java   |  27 ++-
  .../net/minecraft/server/EntityDrowned.java   |   9 +-
@@ -53,7 +53,7 @@ Subject: [PATCH] Integrate ridables
  .../controller/ControllerMoveWASDFlying.java  |  58 +++++
  .../controller/ControllerMoveWASDWater.java   |  42 ++++
  .../craftbukkit/entity/CraftLivingEntity.java |  10 +
- 49 files changed, 1138 insertions(+), 69 deletions(-)
+ 49 files changed, 1136 insertions(+), 67 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -222,7 +222,7 @@ index a374c3051..4ab6b4fc4 100644
      public void b(float f, float f1) {}
  
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 0139688c7..4e70a2fc8 100644
+index 55169d564..4e70a2fc8 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -9,6 +9,11 @@ public class EntityCow extends EntityAnimal {
@@ -253,17 +253,6 @@ index 0139688c7..4e70a2fc8 100644
          ItemStack itemstack = entityhuman.b(enumhand);
  
          if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
-@@ -99,8 +113,8 @@ public class EntityCow extends EntityAnimal {
-             mooshroom.setHealth(this.getHealth());
-             mooshroom.setAge(getAge());
-             mooshroom.u(this);
--            mooshroom.aQ = this.aQ;
--            mooshroom.aS = this.aS;
-+            mooshroom.aK = this.aK;
-+            mooshroom.aM = this.aM;
-             mooshroom.lastYaw = this.lastYaw;
-             mooshroom.lastPitch = this.lastPitch;
-             if (this.hasCustomName()) {
 @@ -116,7 +130,7 @@ public class EntityCow extends EntityAnimal {
                  itemstack.subtract(1);
              }