Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4e0ed1f8 Backport fix for MC-167561 (Fixes #2886, closes#2960)
9946cef8 Updated Upstream (Bukkit/CraftBukkit/Spigot)

current-paper

@@ -1 +1 @@
-1.15.2--6044fe49f38f1debb785226934d54904c9f20ea5
+1.15.2--2adc7d796957838713130cf2e1210c7b92f2cfee

patches/api/0011-Implement-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 5e09c1746e3db13c3230138414436cd08abd08c2 Mon Sep 17 00:00:00 2001
+From 2691e239f821ea12194519be18f52dc3cd2cf239 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:19 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -8,10 +8,10 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
  1 file changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 77f4246d7..2e1e27b05 100644
+index e69702e6f..9c4af8a9b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -701,4 +701,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -705,4 +705,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setJumping(boolean jumping);
      // Paper end

patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From 4ebf17348d90eb71f570dae60c164487edcd8d16 Mon Sep 17 00:00:00 2001
+From 2a524b7c61b666f93a27174acbf847a1b0b9959c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:05 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
@@ -8,10 +8,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
  1 file changed, 17 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2e1e27b05..3bf1e1009 100644
+index 9c4af8a9b..aaad2da41 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -716,5 +716,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -720,5 +720,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param safeFallDistance Safe fall distance
       */
      void setSafeFallDistance(float safeFallDistance);

patches/server/0004-Ridables.patch

@@ -1,4 +1,4 @@
-From c455f67309bc18d64dc759e33a47058c42c99c73 Mon Sep 17 00:00:00 2001
+From 4cb137fb77aa92707b9134e63834d9468cbb540d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
@@ -77,7 +77,7 @@ Subject: [PATCH] Ridables
  .../minecraft/server/EntityVindicator.java    |  19 +
  .../net/minecraft/server/EntityWitch.java     |  23 +-
  .../net/minecraft/server/EntityWither.java    |  26 +-
- .../java/net/minecraft/server/EntityWolf.java | 112 ++--
+ .../java/net/minecraft/server/EntityWolf.java | 121 ++--
  .../net/minecraft/server/EntityZombie.java    |  19 +
  .../minecraft/server/EntityZombieHusk.java    |  17 +
  .../server/EntityZombieVillager.java          |  17 +
@@ -95,7 +95,7 @@ Subject: [PATCH] Ridables
  .../controller/ControllerMoveWASDWater.java   |  43 ++
  .../pathfinder/PathfinderGoalHasRider.java    |  21 +
  .../craftbukkit/entity/CraftEntity.java       |  27 +
- 91 files changed, 3035 insertions(+), 194 deletions(-)
+ 91 files changed, 3035 insertions(+), 203 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
@@ -142,7 +142,7 @@ index a5c4cbb67f..efe6afde9b 100644
  
      public ControllerMove(EntityInsentient entityinsentient) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a855d743ac..c60d13b89d 100644
+index 8974c16bf9..6acc65abfa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -172,7 +172,7 @@ index a855d743ac..c60d13b89d 100644
      public boolean noclip;
      public float J;
      protected final Random random;
-@@ -2115,7 +2115,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2112,7 +2112,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -187,7 +187,7 @@ index a855d743ac..c60d13b89d 100644
          }
          return true; // CraftBukkit
      }
-@@ -2150,6 +2156,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2147,6 +2153,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -200,7 +200,7 @@ index a855d743ac..c60d13b89d 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2536,6 +2548,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2533,6 +2545,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -208,7 +208,7 @@ index a855d743ac..c60d13b89d 100644
      public void l(float f) {}
  
      public boolean bA() {
-@@ -3381,4 +3394,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3378,4 +3391,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          void accept(Entity entity, double d0, double d1, double d2);
      }
@@ -1976,7 +1976,7 @@ index 81b7cd06f2..3e6722cfce 100644
          this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 2cee73ace9..f0ef48bb15 100644
+index 1991cee43d..28218f048d 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1988,7 +1988,7 @@ index 2cee73ace9..f0ef48bb15 100644
      private final EntityAIBodyControl c;
      protected NavigationAbstract navigation;
      public PathfinderGoalSelector goalSelector;
-@@ -64,8 +64,8 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -66,8 +66,8 @@ public abstract class EntityInsentient extends EntityLiving {
          this.bI = -1.0F;
          this.goalSelector = new PathfinderGoalSelector(world != null && world.getMethodProfiler() != null ? world.getMethodProfiler() : null);
          this.targetSelector = new PathfinderGoalSelector(world != null && world.getMethodProfiler() != null ? world.getMethodProfiler() : null);
@@ -1999,7 +1999,7 @@ index 2cee73ace9..f0ef48bb15 100644
          this.bq = new ControllerJump(this);
          this.c = this.o();
          this.navigation = this.b(world);
-@@ -494,7 +494,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -502,7 +502,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return super.cW();
      }
  
@@ -2008,7 +2008,7 @@ index 2cee73ace9..f0ef48bb15 100644
          this.bb = f;
      }
  
-@@ -506,8 +506,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -514,8 +514,7 @@ public abstract class EntityInsentient extends EntityLiving {
          this.aZ = f;
      }
  
@@ -2018,7 +2018,7 @@ index 2cee73ace9..f0ef48bb15 100644
          super.o(f);
          this.r(f);
      }
-@@ -1078,7 +1077,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1082,7 +1081,7 @@ public abstract class EntityInsentient extends EntityLiving {
      }
  
      protected boolean a(EntityHuman entityhuman, EnumHand enumhand) {
@@ -2027,7 +2027,7 @@ index 2cee73ace9..f0ef48bb15 100644
      }
  
      public boolean ec() {
-@@ -1377,4 +1376,39 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1381,4 +1380,39 @@ public abstract class EntityInsentient extends EntityLiving {
      public boolean a(Item item) {
          return this.getItemInMainHand().getItem() == item || this.getItemInOffHand().getItem() == item;
      }
@@ -4253,7 +4253,7 @@ index 8977c3516b..f654f27010 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityInsentient.class, 0, false, false, EntityWither.bG));
      }
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index db15d5e0a2..47f0b2df6c 100644
+index eec1e26b6e..47f0b2df6c 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -30,10 +30,28 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -4293,7 +4293,7 @@ index db15d5e0a2..47f0b2df6c 100644
          this.targetSelector.a(1, new PathfinderGoalOwnerHurtByTarget(this));
          this.targetSelector.a(2, new PathfinderGoalOwnerHurtTarget(this));
          this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
-@@ -274,76 +293,56 @@ public class EntityWolf extends EntityTameableAnimal {
+@@ -274,85 +293,56 @@ public class EntityWolf extends EntityTameableAnimal {
  
      @Override
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
@@ -4325,7 +4325,14 @@ index db15d5e0a2..47f0b2df6c 100644
 -                    boolean flag = super.a(entityhuman, enumhand);
 -
 -                    if (!flag || this.isBaby()) {
--                        this.goalSit.setSitting(!this.isSitting());
+-                        //this.goalSit.setSitting(!this.isSitting()); // Paper start - copied from below
+-                        if (this.i((EntityLiving) entityhuman) && !this.i(itemstack)) {
+-                            this.goalSit.setSitting(!this.isSitting());
+-                            this.jumping = false;
+-                            this.navigation.o();
+-                            this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason
+-                        }
+-                        // Paper end - copied from below
 -                    }
 -
 -                    return flag;
@@ -4346,12 +4353,14 @@ index db15d5e0a2..47f0b2df6c 100644
                      return true;
                  }
 -
+-                /* Paper start - Move into above
 -                if (this.i((EntityLiving) entityhuman) && !this.i(itemstack)) {
 -                    this.goalSit.setSitting(!this.isSitting());
 -                    this.jumping = false;
 -                    this.navigation.o();
 -                    this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason
 -                }
+-                 */ // Paper end
 -            } else if (item == Items.BONE && !this.isAngry()) {
 -                if (!entityhuman.abilities.canInstantlyBuild) {
 -                    itemstack.subtract(1);
@@ -4403,7 +4412,7 @@ index db15d5e0a2..47f0b2df6c 100644
          Item item = itemstack.getItem();
  
          return item.isFood() && item.getFoodInfo().c();
-@@ -433,6 +432,13 @@ public class EntityWolf extends EntityTameableAnimal {
+@@ -442,6 +432,13 @@ public class EntityWolf extends EntityTameableAnimal {
          return !this.isAngry() && super.a(entityhuman);
      }
  

patches/server/0009-Giants-naturally-spawn-and-have-AI.patch

@@ -1,4 +1,4 @@
-From baa5038436e12073e9807f59587068410bfbc2b4 Mon Sep 17 00:00:00 2001
+From e2bfe7b5ee42633a1cda48893da60a6a99b5d433 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 00:43:12 -0500
 Subject: [PATCH] Giants naturally spawn and have AI
@@ -129,10 +129,10 @@ index ff8a41a539..d132a6105f 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f0ef48bb15..412b521fc7 100644
+index 28218f048d..00cbd99914 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -863,6 +863,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -867,6 +867,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return f;
      }
  
@@ -140,7 +140,7 @@ index f0ef48bb15..412b521fc7 100644
      protected void a(DifficultyDamageScaler difficultydamagescaler) {
          if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
              int i = this.random.nextInt(2);
-@@ -970,6 +971,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -974,6 +975,7 @@ public abstract class EntityInsentient extends EntityLiving {
          }
      }
  

patches/server/0016-Cows-eat-mushrooms.patch

@@ -1,4 +1,4 @@
-From 4911ba74585eb8bca5bb424f9ac530c7f4781587 Mon Sep 17 00:00:00 2001
+From f75496fc308131a383f257d95037ee10576c6834 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 eat mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
  4 files changed, 77 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c60d13b89d..21b2ff8f8f 100644
+index 6acc65abfa..1d96f0242a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1039,6 +1039,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1037,6 +1037,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -22,7 +22,7 @@ index c60d13b89d..21b2ff8f8f 100644
      public void a(SoundEffect soundeffect, float f, float f1) {
          if (!this.isSilent()) {
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
-@@ -2575,6 +2576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2572,6 +2573,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  

patches/server/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -1,4 +1,4 @@
-From 94704c548769a187716a810628b62f0e693125ea Mon Sep 17 00:00:00 2001
+From ee1b998efc94db1f33ec6d73fc1e39fbb2b9a024 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -25,10 +25,10 @@ index 816d301f1c..0971f25b56 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 21b2ff8f8f..1d967ad6a1 100644
+index 1d96f0242a..a9b1ce4165 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1382,6 +1382,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1380,6 +1380,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -36,7 +36,7 @@ index 21b2ff8f8f..1d967ad6a1 100644
      public double h(Entity entity) {
          return this.c(entity.getPositionVector());
      }
-@@ -1906,14 +1907,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1903,14 +1904,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(new ItemStack(imaterial), (float) i);
      }
  

patches/server/0030-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From 4f7e9fe896649cbd6b8825bbf68e03e692a347f6 Mon Sep 17 00:00:00 2001
+From 88d528ef7964497c96f0bce8305d89ffecd53284 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1d967ad6a1..2bbdb994a5 100644
+index a9b1ce4165..44ae05b8a2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1284,6 +1284,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1282,6 +1282,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.inLava = true;
      }
  

patches/server/0040-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 09c4fa30b4b8742d5c5c5d38f009725cf6fed262 Mon Sep 17 00:00:00 2001
+From 9808c450e63a2d12f8a05365b9150bf36bdea31c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -17,10 +17,10 @@ Subject: [PATCH] Implement AFK API
  10 files changed, 112 insertions(+), 24 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2bbdb994a5..3e5dd43626 100644
+index 44ae05b8a2..4358505dc2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1375,6 +1375,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1373,6 +1373,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return MathHelper.c(f * f + f1 * f1 + f2 * f2);
      }
  

patches/server/0047-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From ab95bc83469b54decf231cecc3f279df5ab9246d Mon Sep 17 00:00:00 2001
+From 311a1c53877efc12983e72b3ade0b7ef0dcf6f9d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:52 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent
@@ -11,7 +11,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
  4 files changed, 17 insertions(+), 13 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
-index 5e3ac055d2..35c162a902 100644
+index 09c7c13183..6880cdd7f9 100644
 --- a/src/main/java/net/minecraft/server/BlockPortal.java
 +++ b/src/main/java/net/minecraft/server/BlockPortal.java
 @@ -54,6 +54,7 @@ public class BlockPortal extends Block {
@@ -86,7 +86,7 @@ index 5e3ac055d2..35c162a902 100644
                      break;
                      // CraftBukkit start - add the block to our list
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3e5dd43626..43237a3d59 100644
+index 4358505dc2..2e151ebc19 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -168,9 +168,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 3e5dd43626..43237a3d59 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2217,6 +2217,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2214,6 +2214,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.world.getMethodProfiler().enter("portal");
                      this.ag = i;
                      this.portalCooldown = this.ba();

patches/server/0055-Ladders-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From 7a07a5944cc64e0da2375e81265974bb692f3a0e Mon Sep 17 00:00:00 2001
+From 7f2f546db574f258bf18111c8a6db0d9b8169d35 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,10 +17,10 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
  10 files changed, 25 insertions(+), 9 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 43237a3d59..8ad20994bf 100644
+index 2e151ebc19..f1c749c38f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1510,6 +1510,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1508,6 +1508,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isCollidable() {

patches/server/0058-Dispenser-curse-of-binding-protection.patch

@@ -1,4 +1,4 @@
-From a6b9b76f07adb9762f47a391ff0ac5980b56ddb6 Mon Sep 17 00:00:00 2001
+From 91bbc9a067e0d57d7f29d9325ba371db83a9e657 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection
@@ -10,10 +10,10 @@ Subject: [PATCH] Dispenser curse of binding protection
  3 files changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 412b521fc7..848f03f4c0 100644
+index 00cbd99914..66b4831949 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -909,6 +909,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -913,6 +913,13 @@ public abstract class EntityInsentient extends EntityLiving {
  
      }
  

patches/server/0090-Allow-leashing-villagers.patch

@@ -1,4 +1,4 @@
-From a97f9ffa6e1d0135339df3b5270bbbe342076373 Mon Sep 17 00:00:00 2001
+From b9fa5c0edbd9b5602957f7c8e8b67751ae2bea1f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers
@@ -11,10 +11,10 @@ Subject: [PATCH] Allow leashing villagers
  4 files changed, 19 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 848f03f4c0..33fcb92e3b 100644
+index 66b4831949..bac6cea1ff 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1058,6 +1058,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1062,6 +1062,7 @@ public abstract class EntityInsentient extends EntityLiving {
          if (!this.isAlive()) {
              return false;
          } else if (this.getLeashHolder() == entityhuman) {