Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
cc001a73b Climbing should not bypass cramming gamerule
b9930b39d Add legacy plugin count to metrics
4729e6b90 Add more lightning API
5e220bcb5 [ci skip] add stale bot configuration
2a44498a5 Add PlayerItemCooldownEvent
fd33bcee1 Add LivingEntity#clearActiveItem
a99e0ca05 Fix Player spawnParticle x/y/z precision loss

patches/api/0011-LivingEntity-safeFallDistance.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9bf525b79..76b599255 100644
+index e535750d0..156df8cf2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -829,4 +829,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -836,4 +836,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void playPickupItemAnimation(@NotNull Item item, int quantity);
      // Paper end

patches/api/0028-LivingEntity-broadcastItemBreak.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 76b599255..fa361fd88 100644
+index 156df8cf2..d3adc23bb 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -844,5 +844,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -851,5 +851,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param safeFallDistance Safe fall distance
       */
      void setSafeFallDistance(float safeFallDistance);

patches/server/0001-Tuinity-Server-Changes.patch

@@ -7903,7 +7903,7 @@ index 550232cb38..229c3b0f0c 100644
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0c952fea30..677188661e 100644
+index e44e5652c1..8fdfec3b8e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -8259,7 +8259,7 @@ index 0c952fea30..677188661e 100644
      public double h(Entity entity) {
          return this.e(entity.getPositionVector());
      }
-@@ -1938,9 +2168,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1944,9 +2174,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              float f1 = this.size.width * 0.8F;
              AxisAlignedBB axisalignedbb = AxisAlignedBB.g((double) f1, 0.10000000149011612D, (double) f1).d(this.locX(), this.getHeadY(), this.locZ());
  
@@ -8271,7 +8271,7 @@ index 0c952fea30..677188661e 100644
          }
      }
  
-@@ -1948,11 +2178,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1954,11 +2184,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return EnumInteractionResult.PASS;
      }
  
@@ -8287,7 +8287,7 @@ index 0c952fea30..677188661e 100644
          return false;
      }
  
-@@ -3294,12 +3526,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3300,12 +3532,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.locBlock;
      }
  
@@ -8304,7 +8304,7 @@ index 0c952fea30..677188661e 100644
      }
  
      public void setMot(double d0, double d1, double d2) {
-@@ -3354,7 +3590,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3360,7 +3596,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          }
          // Paper end
          if (this.loc.x != d0 || this.loc.y != d1 || this.loc.z != d2) {
@@ -8347,23 +8347,23 @@ index 7ddf276732..23007c9ccb 100644
              if (entityhuman != null) {
                  double d0 = entityhuman.h((Entity) this); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fe0334b505..87cd6fb0c0 100644
+index b88bd19fc3..a0916a8836 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2847,7 +2847,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2846,7 +2846,11 @@ public abstract class EntityLiving extends Entity {
              return;
          }
          // Paper - end don't run getEntities if we're not going to use its result
--        List<Entity> list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this));
+-        List<Entity> list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.pushable(this, world.paperConfig.fixClimbingBypassingCrammingRule)); // Paper - fix climbing bypassing cramming rule
 +        // Tuinity start - reduce memory allocation from collideNearby
 +        List<Entity> list = com.tuinity.tuinity.util.CachedLists.getTempGetEntitiesList();
-+        this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this), list);
++        this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.pushable(this, world.paperConfig.fixClimbingBypassingCrammingRule), list);
 +        try {
 +        // Tuinity end - reduce memory allocation from collideNearby
  
          if (!list.isEmpty()) {
              // Paper - move up
-@@ -2876,6 +2880,9 @@ public abstract class EntityLiving extends Entity {
+@@ -2875,6 +2879,9 @@ public abstract class EntityLiving extends Entity {
                  this.C(entity);
              }
          }

patches/server/0003-Purpur-config-files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 8a19c96499..de75e33a68 100644
+index 03c95b30d8..3b9b44851c 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -581,7 +581,7 @@ public class Metrics {
+@@ -585,7 +585,7 @@ public class Metrics {
              boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
@@ -17,7 +17,7 @@ index 8a19c96499..de75e33a68 100644
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
-@@ -590,8 +590,8 @@ public class Metrics {
+@@ -594,8 +594,8 @@ public class Metrics {
                  }));
  
                  metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
@@ -86,7 +86,7 @@ index 59abca0fd2..ca4d260e8f 100644
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000..d59c5cf3ba
+index 0000000000..e83fcc0eff
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -0,0 +1,130 @@

patches/server/0012-LivingEntity-safeFallDistance.patch

@@ -17,7 +17,7 @@ index 702242653a..9f4f56c47e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 8af1fe5d82..345e1df09e 100644
+index fcb3114762..ce26e65aaf 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -210,7 +210,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -30,10 +30,10 @@ index 8af1fe5d82..345e1df09e 100644
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 87cd6fb0c0..27e6d39a2f 100644
+index a0916a8836..561af0a097 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -133,6 +133,7 @@ public abstract class EntityLiving extends Entity {
+@@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {
      // CraftBukkit start
      public int expToDrop;
      public int maxAirTicks = 300;
@@ -41,7 +41,7 @@ index 87cd6fb0c0..27e6d39a2f 100644
      boolean forceDrops;
      ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
      public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
-@@ -227,8 +228,8 @@ public abstract class EntityLiving extends Entity {
+@@ -226,8 +227,8 @@ public abstract class EntityLiving extends Entity {
              this.cR();
          }
  
@@ -52,7 +52,7 @@ index 87cd6fb0c0..27e6d39a2f 100644
  
              if (!iblockdata.isAir()) {
                  double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
-@@ -1680,7 +1681,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1679,7 +1680,7 @@ public abstract class EntityLiving extends Entity {
          MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
          float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
  
@@ -62,10 +62,10 @@ index 87cd6fb0c0..27e6d39a2f 100644
  
      protected void playBlockStepSound() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9e9bdf9bc2..2fd4bc818a 100644
+index 1fc356d0b7..6644723124 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -809,4 +809,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -816,4 +816,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          getHandle().receive(((CraftItem) item).getHandle(), quantity);
      }
      // Paper end

patches/server/0018-EntityMoveEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 27e6d39a2f..15d255180f 100644
+index 561af0a097..21b5b7d2c4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2802,6 +2802,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2801,6 +2801,20 @@ public abstract class EntityLiving extends Entity {
  
          this.collideNearby();
          this.world.getMethodProfiler().exit();

patches/server/0018-PaperPR-PlayerItemCooldownEvent.patch

@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <kennytv@t-online.de>
-Date: Mon, 20 Apr 2020 13:57:06 +0200
-Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
-index 27cde8c15..3c3bcc7f9 100644
---- a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
-+++ b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
-@@ -2,12 +2,23 @@ package net.minecraft.server;
- 
- public class ItemCooldownPlayer extends ItemCooldown {
- 
--    private final EntityPlayer a;
-+    private final EntityPlayer a; public EntityPlayer getEntityPlayer() { return a; } // Purpur - OBFHELPER
- 
-     public ItemCooldownPlayer(EntityPlayer entityplayer) {
-         this.a = entityplayer;
-     }
- 
-+    // Purpur start
-+    @Override
-+    public void setCooldown(Item item, int ticks) {
-+        net.pl3x.purpur.event.player.PlayerItemCooldownEvent event =
-+                new net.pl3x.purpur.event.player.PlayerItemCooldownEvent(getEntityPlayer().getBukkitEntity(), org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(item), ticks);
-+        if (event.callEvent()) {
-+            super.setCooldown(item, event.getCooldown());
-+        }
-+    }
-+    // Purpur end
-+
-     @Override
-     protected void b(Item item, int i) {
-         super.b(item, i);

patches/server/0019-Player-invulnerabilities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 694159cca..ddef5d06f 100644
+index 694159cca7..ddef5d06f4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -148,6 +148,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,7 +67,7 @@ index 694159cca..ddef5d06f 100644
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 13da04e5b..11473f06b 100644
+index 13da04e5b3..11473f06be 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1653,6 +1653,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -79,7 +79,7 @@ index 13da04e5b..11473f06b 100644
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a86a4467a..6648d82d4 100644
+index 70f702680f..0b453e9d12 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -905,6 +905,8 @@ public abstract class PlayerList {
@@ -92,7 +92,7 @@ index a86a4467a..6648d82d4 100644
          return entityplayer1;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2578a4677..c441fcea9 100644
+index 2578a4677d..c441fcea9b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -67,4 +67,11 @@ public class PurpurWorldConfig {
@@ -108,7 +108,7 @@ index 2578a4677..c441fcea9 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 37f325d3a..57bde0db3 100644
+index 6d97bcffb6..e781ae267d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2232,5 +2232,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0020-Anvil-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Anvil API
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index fc2038df8..4aa6b035a 100644
+index fc2038df89..4aa6b035a6 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -20,6 +20,8 @@ public class ContainerAnvil extends ContainerAnvilAbstract {
@@ -92,7 +92,7 @@ index fc2038df8..4aa6b035a 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-index 9374c2706..d45f356be 100644
+index 9374c27061..d45f356be3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
 @@ -9,7 +9,7 @@ import org.bukkit.inventory.AnvilInventory;

patches/server/0021-Configurable-villager-brain-ticks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager brain ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 3c20a4e1c..a02f54ab3 100644
+index 3c20a4e1c4..a02f54ab3a 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -58,6 +58,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -38,7 +38,7 @@ index 3c20a4e1c..a02f54ab3 100644
          if (this.bF) {
              this.bF = false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c441fcea9..c7fb5a737 100644
+index c441fcea9b..c7fb5a737c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -74,4 +74,11 @@ public class PurpurWorldConfig {

patches/server/0022-Alternative-Keepalive-Handling.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
-index 8e93f1540..470f92c4f 100644
+index 8e93f1540b..470f92c4fb 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 @@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
@@ -17,7 +17,7 @@ index 8e93f1540..470f92c4f 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 11473f06b..32bfd0e22 100644
+index 11473f06be..32bfd0e222 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -83,6 +83,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -68,7 +68,7 @@ index 11473f06b..32bfd0e22 100644
          if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
              int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6ff5e0783..f1d6c32fd 100644
+index 263042d7fb..07f558d0d2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -154,6 +154,11 @@ public class PurpurConfig {

patches/server/0023-Silk-touch-spawners.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Silk touch spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 4b4f14711..372ee6adc 100644
+index 4b4f14711d..372ee6adce 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -223,6 +223,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -17,7 +17,7 @@ index 4b4f14711..372ee6adc 100644
          if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
              float f = 0.5F;
 diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
-index 81e145ff0..91b92d95a 100644
+index 81e145ff07..91b92d95a9 100644
 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
 +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
 @@ -1,5 +1,14 @@
@@ -105,7 +105,7 @@ index 81e145ff0..91b92d95a 100644
          return i;
 diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java
 new file mode 100644
-index 000000000..5c7f73918
+index 0000000000..5c7f739185
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemSpawner.java
 @@ -0,0 +1,23 @@
@@ -133,7 +133,7 @@ index 000000000..5c7f73918
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 1c861bccc..67ebcbe4d 100644
+index 1c861bccc2..67ebcbe4da 100644
 --- a/src/main/java/net/minecraft/server/Items.java
 +++ b/src/main/java/net/minecraft/server/Items.java
 @@ -180,7 +180,7 @@ public class Items {
@@ -146,7 +146,7 @@ index 1c861bccc..67ebcbe4d 100644
      public static final Item cy = a(Blocks.CHEST, CreativeModeTab.c);
      public static final Item cz = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c7fb5a737..ba89efb31 100644
+index c7fb5a737c..ba89efb315 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,6 +1,12 @@

patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index 553c8affa..92cca6c44 100644
+index 553c8affab..92cca6c44f 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 @@ -163,6 +163,23 @@ public class BlockTurtleEgg extends Block {
@@ -34,7 +34,7 @@ index 553c8affa..92cca6c44 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ba89efb31..f403f9dc6 100644
+index ba89efb315..f403f9dc6c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -104,6 +104,15 @@ public class PurpurWorldConfig {

patches/server/0025-MC-4-Fix-Item-position-desync.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] MC-4 Fix - Item position desync
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index f322dccd8..5cb6bb896 100644
+index f322dccd83..5cb6bb896e 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -134,6 +134,12 @@ public class EntityTrackerEntry {
@@ -22,7 +22,7 @@ index f322dccd8..5cb6bb896 100644
                  boolean flag2 = flag1 || this.tickCounter % 60 == 0;
                  boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1;
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index e5da2b19c..6d9d52e4f 100644
+index e5da2b19c1..6d9d52e4fc 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 @@ -14,10 +14,12 @@ public class PacketPlayOutEntity implements Packet<PacketListenerPlayOut> {
@@ -39,7 +39,7 @@ index e5da2b19c..6d9d52e4f 100644
          return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f1d6c32fd..04ed0b1db 100644
+index 07f558d0d2..ba2006fe08 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -177,4 +177,9 @@ public class PurpurConfig {

patches/server/0026-Fix-vanilla-command-permission-handler.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix vanilla command permission handler
 
 
 diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-index d9c47f3fc..cf35c9d54 100644
+index d9c47f3fc1..cf35c9d545 100644
 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 @@ -35,6 +35,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
@@ -17,7 +17,7 @@ index d9c47f3fc..cf35c9d54 100644
      public void removeCommand(String name) {
          children.remove(name);
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index f34461460..8d89e671e 100644
+index f344614600..8d89e671eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 @@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {

patches/server/0027-Logger-settings-suppressing-pointless-logs.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index c680319e4..eaa1063ff 100644
+index c680319e40..eaa1063ff2 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -170,6 +170,7 @@ public class AdvancementDataPlayer {
@@ -17,7 +17,7 @@ index c680319e4..eaa1063ff 100644
                              }
                              // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 04ed0b1db..83d146a18 100644
+index ba2006fe08..1b6b265e60 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -182,4 +182,11 @@ public class PurpurConfig {
@@ -33,7 +33,7 @@ index 04ed0b1db..83d146a18 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-index b14333ce9..d25204f7d 100644
+index b14333ce9e..d25204f7d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
 @@ -254,6 +254,7 @@ public final class CraftLegacy {

patches/server/0028-Disable-outdated-build-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b65629cac..71f8435e4 100644
+index b65629cac7..71f8435e4a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -259,7 +259,7 @@ public class Main {

patches/server/0029-Giants-AI-settings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings
 
 
 diff --git a/src/main/java/net/minecraft/server/AttributeMapBase.java b/src/main/java/net/minecraft/server/AttributeMapBase.java
-index c57e23e16..92aa104dc 100644
+index c57e23e16b..92aa104dc5 100644
 --- a/src/main/java/net/minecraft/server/AttributeMapBase.java
 +++ b/src/main/java/net/minecraft/server/AttributeMapBase.java
 @@ -41,6 +41,7 @@ public class AttributeMapBase {
@@ -17,7 +17,7 @@ index c57e23e16..92aa104dc 100644
      public AttributeModifiable a(AttributeBase attributebase) {
          return (AttributeModifiable) this.b.computeIfAbsent(attributebase, (attributebase1) -> {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 152f3cc5b..870868f0e 100644
+index 8fdfec3b8e..c90a767c78 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -30,7 +30,7 @@ index 152f3cc5b..870868f0e 100644
      public float I;
      protected final Random random;
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index 9f4f56c47..8dce2aad7 100644
+index 9f4f56c47e..8dce2aad77 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
 @@ -4,9 +4,68 @@ public class EntityGiantZombie extends EntityMonster {
@@ -112,7 +112,7 @@ index 9f4f56c47..8dce2aad7 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 23007c9cc..ba4a2bcfa 100644
+index 23007c9ccb..ba4a2bcfa0 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -946,6 +946,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -146,10 +146,10 @@ index 23007c9cc..ba4a2bcfa 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5228a11a5..76ff4dd90 100644
+index 21b5b7d2c4..bc88db73b7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2160,7 +2160,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2159,7 +2159,7 @@ public abstract class EntityLiving extends Entity {
          this.enderTeleportTo(vec3d.x, vec3d.y, vec3d.z);
      }
  
@@ -159,7 +159,7 @@ index 5228a11a5..76ff4dd90 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f403f9dc6..f5004f221 100644
+index f403f9dc6c..f5004f221e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -113,6 +113,23 @@ public class PurpurWorldConfig {

patches/server/0030-Illusioners-AI-settings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Illusioners AI settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 50442b3a4..b6c6b4d54 100644
+index 50442b3a49..b6c6b4d54e 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -19,6 +19,17 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -27,7 +27,7 @@ index 50442b3a4..b6c6b4d54 100644
      protected void initPathfinder() {
          super.initPathfinder();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f5004f221..0073e3b85 100644
+index f5004f221e..0073e3b85a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -130,6 +130,15 @@ public class PurpurWorldConfig {

patches/server/0032-Charged-creeper-naturally-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Charged creeper naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 79ef95507..eb4a0ef0e 100644
+index 79ef955070..eb4a0ef0e7 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -23,6 +23,17 @@ public class EntityCreeper extends EntityMonster {
@@ -27,7 +27,7 @@ index 79ef95507..eb4a0ef0e 100644
      protected void initPathfinder() {
          this.goalSelector.a(1, new PathfinderGoalFloat(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b652bfbdc..a1c0dc687 100644
+index b652bfbdc3..a1c0dc687a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -113,6 +113,11 @@ public class PurpurWorldConfig {

patches/server/0033-Rabbit-naturally-spawn-toast-and-killer.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index 80a4a7175..25a9b7906 100644
+index 80a4a71753..25a9b7906b 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -297,6 +297,10 @@ public class EntityRabbit extends EntityAnimal {
@@ -37,7 +37,7 @@ index 80a4a7175..25a9b7906 100644
          int i = this.random.nextInt(100);
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a1c0dc687..fe82dc392 100644
+index a1c0dc687a..fe82dc392b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -144,6 +144,13 @@ public class PurpurWorldConfig {

patches/server/0034-Fix-outdated-server-showing-in-ping-before-server-fu.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 9beb6fad2..b98d09442 100644
+index 9beb6fad22..b98d094422 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -133,6 +133,7 @@ public class PacketStatusListener implements PacketStatusInListener {

patches/server/0035-Make-Iron-Golems-Swim.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make Iron Golems Swim
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 0a5c27e73..bdff23688 100644
+index 0a5c27e732..bdff236883 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -24,6 +24,7 @@ public class EntityIronGolem extends EntityGolem implements IEntityAngerable {
@@ -17,7 +17,7 @@ index 0a5c27e73..bdff23688 100644
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
          this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D, false));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fe82dc392..fd552adb9 100644
+index fe82dc392b..fd552adb95 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -144,6 +144,11 @@ public class PurpurWorldConfig {

patches/server/0036-Dont-send-useless-entity-packets.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send useless entity packets
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 5cb6bb896..aea72b0db 100644
+index 5cb6bb896e..aea72b0db1 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -178,6 +178,7 @@ public class EntityTrackerEntry {
@@ -40,7 +40,7 @@ index 5cb6bb896..aea72b0db 100644
          this.tracker.c(entityplayer);
          entityplayer.c(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index 6d9d52e4f..0010448e3 100644
+index 6d9d52e4fc..0010448e3a 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 @@ -5,11 +5,11 @@ import java.io.IOException;
@@ -61,7 +61,7 @@ index 6d9d52e4f..0010448e3 100644
      protected boolean h;
      protected boolean i;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 83d146a18..30935339e 100644
+index 1b6b265e60..fd2bf433a1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -178,6 +178,11 @@ public class PurpurConfig {

patches/server/0037-Tulips-change-fox-type.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Tulips change fox type
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 56c119e8d..8845afd83 100644
+index 56c119e8d1..8845afd83d 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -37,9 +37,9 @@ public class EntityFox extends EntityAnimal {
@@ -70,7 +70,7 @@ index 56c119e8d..8845afd83 100644
      protected org.bukkit.event.entity.EntityDeathEvent d(DamageSource damagesource) { // Paper
          ItemStack itemstack = this.getEquipment(EnumItemSlot.MAINHAND).cloneItemStack(); // Paper
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 67ebcbe4d..4c379916d 100644
+index 67ebcbe4da..4c379916d8 100644
 --- a/src/main/java/net/minecraft/server/Items.java
 +++ b/src/main/java/net/minecraft/server/Items.java
 @@ -119,8 +119,8 @@ public class Items {
@@ -85,7 +85,7 @@ index 67ebcbe4d..4c379916d 100644
      public static final Item bq = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
      public static final Item br = a(Blocks.CORNFLOWER, CreativeModeTab.c);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fd552adb9..40bc4cc77 100644
+index fd552adb95..40bc4cc77b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -118,6 +118,11 @@ public class PurpurWorldConfig {

patches/server/0038-Breedable-Polar-Bears.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Breedable Polar Bears
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index 914c6e48d..99f0bd8f8 100644
+index 914c6e48d6..99f0bd8f82 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -23,6 +23,30 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
@@ -75,7 +75,7 @@ index 914c6e48d..99f0bd8f8 100644
          this.datawatcher.set(EntityPolarBear.bo, flag);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 40bc4cc77..882ac4c1f 100644
+index 40bc4cc77b..882ac4c1f6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -154,6 +154,14 @@ public class PurpurWorldConfig {

patches/server/0039-Chickens-can-retaliate.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Chickens can retaliate
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index 182469fd3..11a612fa3 100644
+index 182469fd39..11a612fa39 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -17,16 +17,35 @@ public class EntityChicken extends EntityAnimal {
@@ -55,7 +55,7 @@ index 182469fd3..11a612fa3 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 882ac4c1f..95e801ce2 100644
+index 882ac4c1f6..95e801ce26 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -113,6 +113,11 @@ public class PurpurWorldConfig {

patches/server/0040-Add-option-to-set-armorstand-step-height.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 66597c6e1..5cde0f0d3 100644
+index 8fef94ad9a..df3fc83029 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -618,6 +618,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -17,7 +17,7 @@ index 66597c6e1..5cde0f0d3 100644
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 95e801ce2..f01c74a2e 100644
+index 95e801ce26..f01c74a2ea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -63,6 +63,11 @@ public class PurpurWorldConfig {

patches/server/0042-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] MC-147659 - Fix non black cats spawning in swamp huts
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
-index 6d0ebd8af..c7a787007 100644
+index 6d0ebd8afe..c7a7870074 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
 @@ -80,8 +80,9 @@ public class MobSpawnerCat implements MobSpawner {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a1ffbfb3a..3cb24f4ff 100644
+index c90a767c78..cdd7b8d48f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2769,6 +2769,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2775,6 +2775,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
@@ -17,7 +17,7 @@ index a1ffbfb3a..3cb24f4ff 100644
          this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 42e6761c8..cfb009c81 100644
+index 42e6761c8b..cfb009c811 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal {
@@ -110,10 +110,10 @@ index 42e6761c8..cfb009c81 100644
      public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a((World) worldserver);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 76ff4dd90..5c79c50ac 100644
+index bc88db73b7..8ed95fb471 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -81,7 +81,7 @@ public abstract class EntityLiving extends Entity {
+@@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
      public int maxNoDamageTicks;
      public final float ay;
      public final float az;
@@ -123,7 +123,7 @@ index 76ff4dd90..5c79c50ac 100644
      public float aC;
      public float aD;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b32f4d74a..d8bd7ffd5 100644
+index b32f4d74a0..d8bd7ffd5f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -132,6 +132,11 @@ public class PurpurWorldConfig {

patches/server/0044-Fix-cow-rotation-when-shearing-mooshroom.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 1aacbae04..38df17bd2 100644
+index 1aacbae04c..38df17bd20 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -135,7 +135,13 @@ public class EntityMushroomCow extends EntityCow implements IShearable {

patches/server/0045-Pigs-give-saddle-back.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Pigs give saddle back
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index ee94c2827..7f52c3923 100644
+index ee94c2827c..7f52c39234 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -109,6 +109,18 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
@@ -28,7 +28,7 @@ index ee94c2827..7f52c3923 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d8bd7ffd5..7d6c624ac 100644
+index d8bd7ffd5f..7d6c624ac2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -178,6 +178,11 @@ public class PurpurWorldConfig {

patches/server/0046-Snowman-drop-and-put-back-pumpkin.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 48997367a..95ee716fc 100644
+index 48997367a6..95ee716fc9 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -7,6 +7,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -43,7 +43,7 @@ index 48997367a..95ee716fc 100644
              return EnumInteractionResult.PASS;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7d6c624ac..c91f00704 100644
+index 7d6c624ac2..c91f007044 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -198,6 +198,13 @@ public class PurpurWorldConfig {

patches/server/0047-Ender-dragon-always-drop-egg.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ender dragon always drop egg
 
 
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 38dc6086d..f853f6c42 100644
+index 38dc6086d1..f853f6c424 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -358,7 +358,7 @@ public class EnderDragonBattle {
@@ -18,7 +18,7 @@ index 38dc6086d..f853f6c42 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c91f00704..064c158a1 100644
+index c91f007044..064c158a14 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -142,6 +142,11 @@ public class PurpurWorldConfig {

patches/server/0048-Ender-dragon-always-drop-full-exp.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ender dragon always drop full exp
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index de53af8c0..a5a218245 100644
+index de53af8c01..a5a2182455 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -564,7 +564,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -18,7 +18,7 @@ index de53af8c0..a5a218245 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 064c158a1..96b154bf2 100644
+index 064c158a14..96b154bf23 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -143,8 +143,10 @@ public class PurpurWorldConfig {

patches/server/0049-Signs-editable-on-right-click.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Signs editable on right click
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java
-index 3585fd82c..770ad5edf 100644
+index 3585fd82c1..770ad5edfb 100644
 --- a/src/main/java/net/minecraft/server/BlockSign.java
 +++ b/src/main/java/net/minecraft/server/BlockSign.java
 @@ -56,6 +56,17 @@ public abstract class BlockSign extends BlockTileEntity implements IBlockWaterlo
@@ -27,7 +27,7 @@ index 3585fd82c..770ad5edf 100644
              } else {
                  return EnumInteractionResult.PASS;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 2b9d5724c..316766970 100644
+index 2b9d5724c1..3167669702 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -113,6 +113,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -39,7 +39,7 @@ index 2b9d5724c..316766970 100644
          // Paper start
          //this.c = entityhuman;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 96b154bf2..f14e88313 100644
+index 96b154bf23..f14e883133 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -109,6 +109,11 @@ public class PurpurWorldConfig {

patches/server/0050-Signs-allow-color-codes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ddef5d06f..a2924ab61 100644
+index ddef5d06f4..a2924ab618 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1416,6 +1416,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index ddef5d06f..a2924ab61 100644
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 32bfd0e22..cf7540f23 100644
+index 32bfd0e222..cf7540f235 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2816,6 +2816,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -36,7 +36,7 @@ index 32bfd0e22..cf7540f23 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 316766970..852bb5db8 100644
+index 3167669702..852bb5db84 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -93,6 +93,18 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -59,7 +59,7 @@ index 316766970..852bb5db8 100644
      @Override
      public PacketPlayOutTileEntityData getUpdatePacket() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f14e88313..bc5cba307 100644
+index f14e883133..bc5cba3074 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -109,8 +109,10 @@ public class PurpurWorldConfig {

patches/server/0051-Allow-soil-to-moisten-from-water-directly-under-it.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java
-index a315e2628..8dd48669c 100644
+index a315e2628c..8dd48669c2 100644
 --- a/src/main/java/net/minecraft/server/BlockSoil.java
 +++ b/src/main/java/net/minecraft/server/BlockSoil.java
 @@ -116,19 +116,14 @@ public class BlockSoil extends Block {
@@ -36,7 +36,7 @@ index a315e2628..8dd48669c 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bc5cba307..3721bd745 100644
+index bc5cba3074..3721bd745e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -109,6 +109,11 @@ public class PurpurWorldConfig {

patches/server/0052-Controllable-Minecarts.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Controllable Minecarts
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 2291135ea..bc61aaff6 100644
+index 2291135eae..bc61aaff65 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -36,6 +36,12 @@ public class BlockPosition extends BaseBlockPosition {
@@ -22,10 +22,10 @@ index 2291135ea..bc61aaff6 100644
          super(i, j, k);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5c79c50ac..4f75fe92b 100644
+index 8ed95fb471..1ef9fd4347 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -99,9 +99,9 @@ public abstract class EntityLiving extends Entity {
+@@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity {
      protected int aO;protected int getKillCount() { return this.aO; } // Paper - OBFHELPER
      public float lastDamage;
      public boolean jumping; // Paper protected -> public
@@ -39,7 +39,7 @@ index 5c79c50ac..4f75fe92b 100644
      protected double aV;
      protected double aW;
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 9af2bb392..28808712e 100644
+index efe5c0ceca..a814cf280d 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -445,16 +445,62 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -106,7 +106,7 @@ index 9af2bb392..28808712e 100644
          this.move(EnumMoveType.SELF, this.getMot());
          if (!this.onGround) {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a2924ab61..a295968ed 100644
+index a2924ab618..a295968ed3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -991,6 +991,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -118,7 +118,7 @@ index a2924ab61..a295968ed 100644
  
              if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur
 diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
-index ceef7aaf9..002651aaf 100644
+index ceef7aaf92..002651aaf3 100644
 --- a/src/main/java/net/minecraft/server/ItemMinecart.java
 +++ b/src/main/java/net/minecraft/server/ItemMinecart.java
 @@ -103,8 +103,10 @@ public class ItemMinecart extends Item {
@@ -143,7 +143,7 @@ index ceef7aaf9..002651aaf 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3721bd745..4c3e13cf6 100644
+index 3721bd745e..4c3e13cf66 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,5 +1,7 @@

patches/server/0053-Disable-loot-drops-on-death-by-cramming.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4f75fe92b..ace0743eb 100644
+index 1ef9fd4347..29c4b454f0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1485,8 +1485,10 @@ public abstract class EntityLiving extends Entity {
+@@ -1484,8 +1484,10 @@ public abstract class EntityLiving extends Entity {
  
          this.dropInventory(); // CraftBukkit - from below
          if (this.cW() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
@@ -20,7 +20,7 @@ index 4f75fe92b..ace0743eb 100644
          // CraftBukkit start - Call death event
          org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4c3e13cf6..189b32a6f 100644
+index 4c3e13cf66..189b32a6f8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -112,6 +112,11 @@ public class PurpurWorldConfig {

patches/server/0054-Players-should-not-cram-to-death.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a295968ed..36168d0f7 100644
+index a295968ed3..36168d0f7c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1393,7 +1393,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

patches/server/0055-Option-to-toggle-milk-curing-bad-omen.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
-index fcf254bba..79554e18f 100644
+index fcf254bbae..79554e18fc 100644
 --- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
 @@ -20,7 +20,9 @@ public class ItemMilkBucket extends Item {
@@ -19,7 +19,7 @@ index fcf254bba..79554e18f 100644
  
          return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 189b32a6f..11af56df6 100644
+index 189b32a6f8..11af56df60 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -113,8 +113,10 @@ public class PurpurWorldConfig {

patches/server/0056-End-gateway-should-check-if-entity-can-use-portal.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] End gateway should check if entity can use portal
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index e0118a971..ed8e91bf6 100644
+index e0118a971e..ed8e91bf6c 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -127,6 +127,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick

patches/server/0057-Debug-stick-should-not-update-neighbors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Debug stick should not update neighbors
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 3adb29f00..e7759f248 100644
+index 3adb29f004..e7759f2481 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -229,6 +229,11 @@ public final class ItemStack {

patches/server/0058-Fix-the-dead-lagging-the-server.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3cb24f4ff..fba2e13ae 100644
+index cdd7b8d48f..35ed7f6742 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1521,6 +1521,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index 3cb24f4ff..fba2e13ae 100644
  
      public void f(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ace0743eb..b30abd4c9 100644
+index 29c4b454f0..048690b788 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2478,7 +2478,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2477,7 +2477,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  

patches/server/0059-Skip-events-if-there-s-no-listeners.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index 22d748008..cabce1a8b 100644
+index 22d748008d..cabce1a8ba 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -277,6 +277,7 @@ public class CommandDispatcher {

patches/server/0060-Add-permission-for-F3-N-debug.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6648d82d4..879866022 100644
+index 0b453e9d12..7b385eb43e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1059,6 +1059,7 @@ public abstract class PlayerList {

patches/server/0061-Add-wither-skeleton-takes-wither-damage-option.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add wither skeleton takes wither damage option
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
-index 1ae9910fe..c872be77a 100644
+index 1ae9910fef..c872be77a6 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
 @@ -97,6 +97,6 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -17,7 +17,7 @@ index 1ae9910fe..c872be77a 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 11af56df6..79a87a1a1 100644
+index 11af56df60..79a87a1a16 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -271,6 +271,11 @@ public class PurpurWorldConfig {

patches/server/0063-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
-index 8026a55d4..2acbe7437 100644
+index 8026a55d46..2acbe7437d 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
 @@ -38,7 +38,7 @@ public class EntityThrownTrident extends EntityArrow {
@@ -18,7 +18,7 @@ index 8026a55d4..2acbe7437 100644
  
              if (b0 > 0 && !this.z()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 79a87a1a1..72374b9e7 100644
+index 79a87a1a16..72374b9e76 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -114,9 +114,11 @@ public class PurpurWorldConfig {

patches/server/0064-Add-enderman-and-creeper-griefing-controls.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index eb4a0ef0e..2256b8162 100644
+index eb4a0ef0e7..2256b81624 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -215,7 +215,7 @@ public class EntityCreeper extends EntityMonster {
@@ -18,7 +18,7 @@ index eb4a0ef0e..2256b8162 100644
  
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index f53525eb3..7b175240e 100644
+index f53525eb32..7b175240e4 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -369,6 +369,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
@@ -47,7 +47,7 @@ index f53525eb3..7b175240e 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 72374b9e7..94fc3230a 100644
+index 72374b9e76..94fc3230a3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -191,8 +191,10 @@ public class PurpurWorldConfig {

patches/server/0065-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index ba4a2bcfa..b71dea314 100644
+index ba4a2bcfa0..b71dea314c 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -542,7 +542,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index ba4a2bcfa..b71dea314 100644
              Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 94fc3230a..ef7ca798a 100644
+index 94fc3230a3..ef7ca798ab 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -113,10 +113,12 @@ public class PurpurWorldConfig {

patches/server/0066-Villagers-farming-can-bypass-mob-griefing-gamerule.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java
-index 54a555509..0ff202c0d 100644
+index 54a555509e..0ff202c0d7 100644
 --- a/src/main/java/net/minecraft/server/BehaviorFarm.java
 +++ b/src/main/java/net/minecraft/server/BehaviorFarm.java
 @@ -18,7 +18,7 @@ public class BehaviorFarm extends Behavior<EntityVillager> {
@@ -18,7 +18,7 @@ index 54a555509..0ff202c0d 100644
          } else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) {
              return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ef7ca798a..e31094bd1 100644
+index ef7ca798ab..e31094bd17 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -277,9 +277,11 @@ public class PurpurWorldConfig {

patches/server/0067-Villagers-follow-emerald-blocks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Villagers follow emerald blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a02f54ab3..3c222a6a3 100644
+index a02f54ab3a..3c222a6a30 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -74,6 +74,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -23,7 +23,7 @@ index a02f54ab3..3c222a6a3 100644
      public BehaviorController<EntityVillager> getBehaviorController() {
          return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index 1fddf7c77..488a6891d 100644
+index 1fddf7c774..488a6891d8 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 @@ -14,6 +14,8 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -36,7 +36,7 @@ index 1fddf7c77..488a6891d 100644
      private CraftMerchant craftMerchant;
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index f1a509063..74c2d89af 100644
+index f1a509063c..74c2d89af5 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -40,6 +40,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -48,7 +48,7 @@ index f1a509063..74c2d89af 100644
          this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
          this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e31094bd1..2c334ecb6 100644
+index e31094bd17..2c334ecb60 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -278,10 +278,17 @@ public class PurpurWorldConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index b71dea314..84ac5112a 100644
+index b71dea314c..84ac5112a2 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1145,6 +1145,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index b71dea314..84ac5112a 100644
              if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
                  ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 3c222a6a3..563dfc3da 100644
+index 3c222a6a30..563dfc3daa 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -79,6 +79,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -33,7 +33,7 @@ index 3c222a6a3..563dfc3da 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 74c2d89af..96dda6a14 100644
+index 74c2d89af5..96dda6a14f 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -47,6 +47,13 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -51,7 +51,7 @@ index 74c2d89af..96dda6a14 100644
      @Override
      public EntityAgeable createChild(WorldServer worldserver, EntityAgeable entityageable) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2c334ecb6..0ca84d650 100644
+index 2c334ecb60..0ca84d650e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -277,17 +277,21 @@ public class PurpurWorldConfig {

patches/server/0069-Implement-configurable-search-radius-for-villagers-t.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 563dfc3da..33b7bc39f 100644
+index 563dfc3daa..33b7bc39fb 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -894,6 +894,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -18,7 +18,7 @@ index 563dfc3da..33b7bc39f 100644
  
          for (int i = 0; i < 10; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0ca84d650..13fc46d44 100644
+index 0ca84d650e..13fc46d441 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -280,12 +280,16 @@ public class PurpurWorldConfig {

patches/server/0070-Implement-infinite-lava.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement infinite lava
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index d72a88e92..35d55bc15 100644
+index d72a88e927..35d55bc15b 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -195,7 +195,7 @@ public abstract class FluidTypeFlowing extends FluidType {
@@ -36,7 +36,7 @@ index d72a88e92..35d55bc15 100644
  
      protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) {
 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
-index 29930e801..ffab23919 100644
+index 29930e801c..ffab239192 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
 @@ -147,6 +147,18 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -59,7 +59,7 @@ index 29930e801..ffab23919 100644
      protected boolean f() {
          return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 13fc46d44..80e18c758 100644
+index 13fc46d441..80e18c758d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -158,6 +158,13 @@ public class PurpurWorldConfig {

patches/server/0071-Make-lava-flow-speed-configurable.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make lava flow speed configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
-index ffab23919..d981aa5a5 100644
+index ffab239192..d981aa5a5f 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
 @@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -18,7 +18,7 @@ index ffab23919..d981aa5a5 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 80e18c758..7088bee59 100644
+index 80e18c758d..7088bee595 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -160,9 +160,13 @@ public class PurpurWorldConfig {

patches/server/0072-Add-player-death-exp-control-options.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add player death exp control options
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 335cb9c4a..75f987411 100644
+index 335cb9c4a9..75f9874115 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -85,6 +85,8 @@ public abstract class EntityHuman extends EntityLiving {
@@ -40,7 +40,7 @@ index 335cb9c4a..75f987411 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7088bee59..adcd1779c 100644
+index 7088bee595..adcd1779cf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -123,6 +123,13 @@ public class PurpurWorldConfig {

patches/server/0073-PaperPR-Projectile-load-save-limit-per-chunk.patch

@@ -9,12 +9,12 @@ that 5 arrows, 5 snowballs, 5 tridents, etc. will be allowed to be
 saved/loaded per chunk. The default value of -1 disables the limit.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 80b0c08cef..f451b0aa68 100644
+index 5596d9f425..5ffc5af1de 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -699,4 +699,9 @@ public class PaperWorldConfig {
-         wanderingTraderSpawnChanceMin = getInt("wandering-trader.spawn-chance-min", wanderingTraderSpawnChanceMin);
-         wanderingTraderSpawnChanceMax = getInt("wandering-trader.spawn-chance-max", wanderingTraderSpawnChanceMax);
+@@ -704,4 +704,9 @@ public class PaperWorldConfig {
+     private void fixClimbingBypassingCrammingRule() {
+         fixClimbingBypassingCrammingRule = getBoolean("fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
      }
 +
 +    public int projectileSaveLimit = -1;

patches/server/0074-Add-canSaveToDisk-to-Entity.patch

@@ -17,7 +17,7 @@ index 3628b04fc4..b40cb0c7b2 100644
                          final EntityTypes<?> projectileType = entity.getEntityType();
                          if (savedProjectileCounts.getOrDefault(projectileType, 0) >= worldserver.paperConfig.projectileSaveLimit) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fba2e13aef..e8aaddbe1d 100644
+index 35ed7f6742..d908e182b1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0075-Configurable-void-damage-height.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e8aaddbe1d..6841de575f 100644
+index d908e182b1..0d95a7d09c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0077-Add-option-for-boats-to-eject-players-on-land.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for boats to eject players on land
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 45fea38933..78428539f9 100644
+index fdfdf83c28..d53bbe3169 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -440,6 +440,7 @@ public class EntityBoat extends Entity {

patches/server/0082-Climbing-should-not-bypass-cramming-gamerule.patch

@@ -1,190 +0,0 @@
-From 0000000000000000000000000000000000000000 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] Climbing should not bypass cramming gamerule
-
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6841de575f..9f465ff6fe 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1720,6 +1720,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-     }
- 
-     public boolean isCollidable() {
-+        // Purpur start
-+        return isCollidable(false);
-+    }
-+
-+    public boolean isCollidable(boolean ignoreClimbing) {
-+        // Purpur end
-         return false;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 5cde0f0d3c..0b19859019 100644
---- a/src/main/java/net/minecraft/server/EntityArmorStand.java
-+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
-@@ -320,7 +320,7 @@ public class EntityArmorStand extends EntityLiving {
-     }
- 
-     @Override
--    public boolean isCollidable() {
-+    public boolean isCollidable(boolean ignoreClimbing) { // Purpur
-         return false;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 38ce356310..85371542e4 100644
---- a/src/main/java/net/minecraft/server/EntityBat.java
-+++ b/src/main/java/net/minecraft/server/EntityBat.java
-@@ -50,7 +50,7 @@ public class EntityBat extends EntityAmbient {
-     }
- 
-     @Override
--    public boolean isCollidable() {
-+    public boolean isCollidable(boolean ignoreClimbing) { // Purpur
-         return false;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 78428539f9..939a5fb880 100644
---- a/src/main/java/net/minecraft/server/EntityBoat.java
-+++ b/src/main/java/net/minecraft/server/EntityBoat.java
-@@ -106,7 +106,7 @@ public class EntityBoat extends Entity {
-     }
- 
-     @Override
--    public boolean isCollidable() {
-+    public boolean isCollidable(boolean ignoreClimbing) { // Purpur
-         return true;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 345e1df09e..573d4a5c78 100644
---- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-@@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
-     }
- 
-     @Override
--    public boolean isCollidable() {
-+    public boolean isCollidable(boolean ignoreClimbing) { // Purpur
-         return !this.isVehicle();
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c383050b17..ba4b45a1c5 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2866,7 +2866,7 @@ public abstract class EntityLiving extends Entity {
-         // Paper - end don't run getEntities if we're not going to use its result
-         // Tuinity start - reduce memory allocation from collideNearby
-         List<Entity> list = com.tuinity.tuinity.util.CachedLists.getTempGetEntitiesList();
--        this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this), list);
-+        this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.pushable(this, world.purpurConfig.fixClimbingBypassingCrammingRule), list);
-         try {
-         // Tuinity end - reduce memory allocation from collideNearby
- 
-@@ -3011,7 +3011,14 @@ public abstract class EntityLiving extends Entity {
- 
-     @Override
-     public boolean isCollidable() {
--        return this.isAlive() && !this.isSpectator() && !this.isClimbing() && this.collides; // CraftBukkit
-+        // Purpur start
-+        return this.isCollidable(world.purpurConfig.fixClimbingBypassingCrammingRule);
-+    }
-+
-+    @Override
-+    public boolean isCollidable(boolean ignoreClimbing) {
-+        return this.isAlive() && !this.isSpectator() && (ignoreClimbing || !this.isClimbing()) && this.collides; // CraftBukkit 
-+        // Purpur end
-     }
- 
-     // CraftBukkit start - collidable API
-diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 28808712e2..b698ca7e47 100644
---- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-@@ -107,7 +107,7 @@ public abstract class EntityMinecartAbstract extends Entity {
-     }
- 
-     @Override
--    public boolean isCollidable() {
-+    public boolean isCollidable(boolean ignoreClimbing) { // Purpur
-         return true;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 1c682a62b8..f7b92078ea 100644
---- a/src/main/java/net/minecraft/server/EntityParrot.java
-+++ b/src/main/java/net/minecraft/server/EntityParrot.java
-@@ -314,8 +314,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
-     }
- 
-     @Override
--    public boolean isCollidable() {
--        return super.isCollidable(); // CraftBukkit - collidable API
-+    public boolean isCollidable(boolean ignoreClimbing) { // Purpur
-+        return super.isCollidable(ignoreClimbing); // CraftBukkit - collidable API // Purpur
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 36168d0f7c..18e264a1b0 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1945,8 +1945,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     }
- 
-     @Override
--    public boolean isCollidable() {
--        return !isAfk() && super.isCollidable();
-+    public boolean isCollidable(boolean ignoreClimbing) { // Purpur
-+        return !isAfk() && super.isCollidable(ignoreClimbing);
-     }
-     // Purpur end
- 
-diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 9f9d9b2de8..5a05f2abdd 100644
---- a/src/main/java/net/minecraft/server/IEntitySelector.java
-+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
-@@ -45,11 +45,17 @@ public final class IEntitySelector {
-     }
- 
-     public static Predicate<Entity> a(Entity entity) {
-+        // Purpur start
-+        return pushable(entity, false);
-+    }
-+
-+    public static Predicate<Entity> pushable(Entity entity, boolean ignoreClimbing) {
-+        // Purpur end
-         ScoreboardTeamBase scoreboardteambase = entity.getScoreboardTeam();
-         ScoreboardTeamBase.EnumTeamPush scoreboardteambase_enumteampush = scoreboardteambase == null ? ScoreboardTeamBase.EnumTeamPush.ALWAYS : scoreboardteambase.getCollisionRule();
- 
-         return (Predicate) (scoreboardteambase_enumteampush == ScoreboardTeamBase.EnumTeamPush.NEVER ? Predicates.alwaysFalse() : IEntitySelector.g.and((entity1) -> {
--            if (!entity1.canCollideWith(entity) || !entity.canCollideWith(entity1)) { // CraftBukkit - collidable API
-+            if (!entity1.isCollidable(ignoreClimbing) || !entity1.canCollideWith(entity) || !entity.canCollideWith(entity1)) { // CraftBukkit - collidable API
-                 return false;
-             } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ez())) {
-                 return false;
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 33eac638f4..233622a551 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -116,6 +116,7 @@ public class PurpurWorldConfig {
-     public boolean boatEjectPlayersOnLand = false;
-     public boolean disableDropsOnCrammingDeath = false;
-     public boolean entitiesPickUpLootBypassMobGriefing = false;
-+    public boolean fixClimbingBypassingCrammingRule = false;
-     public boolean milkCuresBadOmen = true;
-     public double tridentLoyaltyVoidReturnHeight = 0.0D;
-     public double voidDamageHeight = -64.0D;
-@@ -124,6 +125,7 @@ public class PurpurWorldConfig {
-         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-         disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
-         entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
-+        fixClimbingBypassingCrammingRule = getBoolean("gameplay-mechanics.fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
-         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
-         tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
-         voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);

patches/server/0082-Implement-elytra-settings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ba4b45a1c5..a710a70d46 100644
+index 048690b788..27838680a2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2837,7 +2837,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2836,7 +2836,16 @@ public abstract class EntityLiving extends Entity {
              if (itemstack.getItem() == Items.ELYTRA && ItemElytra.d(itemstack)) {
                  flag = true;
                  if (!this.world.isClientSide && (this.be + 1) % 20 == 0) {
@@ -93,10 +93,10 @@ index 3663b70173..18f767dc57 100644
                          entityhuman.r(20);
                          if (entityhuman.isOnGround()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 233622a551..8b4ff286ab 100644
+index 33eac638f4..44dda36a5d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -131,6 +131,19 @@ public class PurpurWorldConfig {
+@@ -129,6 +129,19 @@ public class PurpurWorldConfig {
          voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
      }
  

patches/server/0083-Item-entity-immunities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9f465ff6fe..7892ae36a4 100644
+index 0d95a7d09c..5ec82345e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1470,6 +1470,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -88,7 +88,7 @@ index aea72b0db1..29731da08d 100644
              int i;
              int j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8b4ff286ab..37b0c4ad75 100644
+index 44dda36a5d..8773003e6f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -101,6 +101,21 @@ public class PurpurWorldConfig {

patches/server/0084-Add-ping-command.patch

@@ -67,7 +67,7 @@ index 86f1cfe454..da53af61d1 100644
          if (!(this.k instanceof EntityPlayer)) {
              throw CommandListenerWrapper.a.create();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ba9c77857e..fccc4f014e 100644
+index e83a9632a7..f01da7be2a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,10 +133,12 @@ public class PurpurConfig {

patches/server/0085-Configurable-jockey-options.patch

@@ -193,10 +193,10 @@ index a5214914a1..b86816205c 100644
      protected void initDatawatcher() {
          super.initDatawatcher();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 37b0c4ad75..9dce359be3 100644
+index 8773003e6f..1254c3d322 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -266,6 +266,15 @@ public class PurpurWorldConfig {
+@@ -264,6 +264,15 @@ public class PurpurWorldConfig {
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
      }
  
@@ -212,7 +212,7 @@ index 37b0c4ad75..9dce359be3 100644
      public boolean enderDragonAlwaysDropsEggBlock = false;
      public boolean enderDragonAlwaysDropsFullExp = false;
      private void enderDragonSettings() {
-@@ -300,6 +309,15 @@ public class PurpurWorldConfig {
+@@ -298,6 +307,15 @@ public class PurpurWorldConfig {
          giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
      }
  
@@ -228,7 +228,7 @@ index 37b0c4ad75..9dce359be3 100644
      public double illusionerMaxHealth = 32.0D;
      public double illusionerMovementSpeed = 0.5D;
      public double illusionerFollowRange = 18.0D;
-@@ -370,8 +388,35 @@ public class PurpurWorldConfig {
+@@ -368,8 +386,35 @@ public class PurpurWorldConfig {
          witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
      }
  

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

@@ -17,7 +17,7 @@ index 6fe5678cff..bd0267ee4b 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 7892ae36a4..87d40ea50a 100644
+index 5ec82345e1..974e75945d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2135,8 +2135,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -321,10 +321,10 @@ index 3a70900c73..dfce36368d 100644
  
              return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9dce359be3..24821f09d4 100644
+index 1254c3d322..ad055f4241 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -332,6 +332,15 @@ public class PurpurWorldConfig {
+@@ -330,6 +330,15 @@ public class PurpurWorldConfig {
          ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
      }
  

patches/server/0087-Customizable-EnderDragon-Health.patch

@@ -26,10 +26,10 @@ index a5a2182455..d2fcd0bc16 100644
          return EntityInsentient.p().a(GenericAttributes.MAX_HEALTH, 200.0D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 24821f09d4..975e25a454 100644
+index ad055f4241..f4362093f3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -277,9 +277,11 @@ public class PurpurWorldConfig {
+@@ -275,9 +275,11 @@ public class PurpurWorldConfig {
  
      public boolean enderDragonAlwaysDropsEggBlock = false;
      public boolean enderDragonAlwaysDropsFullExp = false;

patches/server/0088-Add-phantom-spawning-options.patch

@@ -245,10 +245,10 @@ index ca4d260e8f..a8571dae8d 100644
      public int c() {
          return this.d;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 975e25a454..51f2ec3283 100644
+index f4362093f3..b4e19576ae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -337,10 +337,34 @@ public class PurpurWorldConfig {
+@@ -335,10 +335,34 @@ public class PurpurWorldConfig {
      public double phantomAttackedByCrystalRadius = 0.0D;
      public float phantomAttackedByCrystalDamage = 1.0F;
      public double phantomOrbitCrystalRadius = 0.0D;

patches/server/0089-Implement-bed-explosion-options.patch

@@ -18,7 +18,7 @@ index 24a5c64b65..738535d01a 100644
              }
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 51f2ec3283..9faf638ed6 100644
+index b4e19576ae..415286b2bd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2,6 +2,7 @@ package net.pl3x.purpur;
@@ -37,7 +37,7 @@ index 51f2ec3283..9faf638ed6 100644
  
  import static net.pl3x.purpur.PurpurConfig.log;
  
-@@ -203,6 +205,22 @@ public class PurpurWorldConfig {
+@@ -201,6 +203,22 @@ public class PurpurWorldConfig {
          bambooSmallHeight = getInt("blocks.bamboo.small-height", bambooSmallHeight);
      }
  

patches/server/0090-Implement-respawn-anchor-explosion-options.patch

@@ -30,10 +30,10 @@ index 21c5ad83a9..521d161a3d 100644
  
      public static boolean a(World world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9faf638ed6..f3ed71a2a5 100644
+index 415286b2bd..14996fcaed 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -242,6 +242,22 @@ public class PurpurWorldConfig {
+@@ -240,6 +240,22 @@ public class PurpurWorldConfig {
          lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
      }
  

patches/server/0091-Add-allow-water-in-end-world-option.patch

@@ -68,7 +68,7 @@ index a8571dae8d..7a82a894bb 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index fccc4f014e..1af7baaa1f 100644
+index f01da7be2a..cec0f9d749 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,7 +1,6 @@

patches/server/0093-Entity-lifespan.patch

@@ -104,7 +104,7 @@ index 91941763dd..2c526846d7 100644
                          event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
                      } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f3ed71a2a5..eb5ba7d7e6 100644
+index 14996fcaed..8126603aab 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -103,6 +103,11 @@ public class PurpurWorldConfig {

patches/server/0094-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a710a70d46..a3df10fb2d 100644
+index 27838680a2..bdb1cfac61 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -278,6 +278,13 @@ public abstract class EntityLiving extends Entity {
+@@ -277,6 +277,13 @@ public abstract class EntityLiving extends Entity {
                      double d1 = this.world.getWorldBorder().getDamageAmount();
  
                      if (d1 > 0.0D) {
@@ -23,10 +23,10 @@ index a710a70d46..a3df10fb2d 100644
                      }
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index eb5ba7d7e6..c38da99f4e 100644
+index 8126603aab..cc0752f253 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -180,6 +180,11 @@ public class PurpurWorldConfig {
+@@ -178,6 +178,11 @@ public class PurpurWorldConfig {
          playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
      }
  

patches/server/0095-Squid-EAR-immunity.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c38da99f4e..86a95ca5d5 100644
+index cc0752f253..47df73beca 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -438,6 +438,11 @@ public class PurpurWorldConfig {
+@@ -436,6 +436,11 @@ public class PurpurWorldConfig {
          snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
      }
  

patches/server/0096-Configurable-end-spike-seed.patch

@@ -25,7 +25,7 @@ index 00a1707209..5eb9b3d35e 100644
          List<WorldGenEnder.Spike> list = worldgenfeatureendspikeconfiguration.c();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1af7baaa1f..86e9385fe9 100644
+index cec0f9d749..0a4ef782c8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,5 +1,6 @@

patches/server/0097-Configurable-dungeon-seed.patch

@@ -31,7 +31,7 @@ index 07f7b69fef..6aa1626f38 100644
          int i = random.nextInt(2) + 2;
          int j = -i - 1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 86e9385fe9..c03c9c95d5 100644
+index 0a4ef782c8..5dbf72cf56 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -141,10 +141,13 @@ public class PurpurConfig {

patches/server/0098-Phantoms-burn-in-light.patch

@@ -70,10 +70,10 @@ index 4c379916d8..ea6b61c9b8 100644
      public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b);
      public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 86a95ca5d5..0de1f10452 100644
+index 47df73beca..2403920ae2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -393,6 +393,9 @@ public class PurpurWorldConfig {
+@@ -391,6 +391,9 @@ public class PurpurWorldConfig {
      public int phantomSpawnOverheadRadius = 10;
      public int phantomSpawnMinPerAttempt = 1;
      public int phantomSpawnMaxPerAttempt = -1;
@@ -83,7 +83,7 @@ index 86a95ca5d5..0de1f10452 100644
      private void phantomSettings() {
          phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
          phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
-@@ -409,6 +412,9 @@ public class PurpurWorldConfig {
+@@ -407,6 +410,9 @@ public class PurpurWorldConfig {
          phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
          phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
          phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

patches/server/0099-Configurable-villager-breeding.patch

@@ -18,10 +18,10 @@ index 33b7bc39fb..7cf6d4a4cd 100644
  
      private boolean fr() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0de1f10452..fcc60b2873 100644
+index 2403920ae2..781fb04286 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -456,6 +456,7 @@ public class PurpurWorldConfig {
+@@ -454,6 +454,7 @@ public class PurpurWorldConfig {
      public boolean villagerFollowEmeraldBlock = false;
      public int villagerSpawnIronGolemRadius = 0;
      public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index 0de1f10452..fcc60b2873 100644
      private void villagerSettings() {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
-@@ -464,6 +465,7 @@ public class PurpurWorldConfig {
+@@ -462,6 +463,7 @@ public class PurpurWorldConfig {
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);

patches/server/0100-Redstone-deactivates-spawners.patch

@@ -26,10 +26,10 @@ index c2e830db7a..3b4cc9871c 100644
      public abstract BlockPosition b();
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fcc60b2873..29306f0dd5 100644
+index 781fb04286..3bc976310e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -275,6 +275,11 @@ public class PurpurWorldConfig {
+@@ -273,6 +273,11 @@ public class PurpurWorldConfig {
          signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
      }
  

patches/server/0101-Totems-work-in-inventory.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a3df10fb2d..fe83a4c267 100644
+index bdb1cfac61..a7e0f8fe3d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1325,6 +1325,19 @@ public abstract class EntityLiving extends Entity {
+@@ -1324,6 +1324,19 @@ public abstract class EntityLiving extends Entity {
                  }
              }
  
@@ -29,10 +29,10 @@ index a3df10fb2d..fe83a4c267 100644
              event.setCancelled(itemstack == null);
              this.world.getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 29306f0dd5..c9ccbfed89 100644
+index 3bc976310e..012ea27128 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -185,6 +185,11 @@ public class PurpurWorldConfig {
+@@ -183,6 +183,11 @@ public class PurpurWorldConfig {
          teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
      }
  

patches/server/0102-Fix-death-message-colors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix death message colors
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 18e264a1b0..c669141d21 100644
+index 36168d0f7c..563eb77ce3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -839,7 +839,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

patches/server/0105-Add-vindicator-johnny-spawn-chance.patch

@@ -22,7 +22,7 @@ index c0d26aa9dc..8f812aa913 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c9ccbfed89..18703229da 100644
+index 012ea27128..d09cead853 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -40,6 +40,11 @@ public class PurpurWorldConfig {

patches/server/0107-Add-option-to-disable-mushroom-block-updates.patch

@@ -73,7 +73,7 @@ index e8f340b9f2..3490af6fe0 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c03c9c95d5..843e105545 100644
+index 5dbf72cf56..43e76d030f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -205,6 +205,11 @@ public class PurpurConfig {

patches/server/0108-Dispensers-place-anvils-option.patch

@@ -61,10 +61,10 @@ index 7b8a470d97..d1f9d2884d 100644
  
      static void a(ISourceBlock isourceblock, Entity entity, EnumDirection enumdirection) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 18703229da..7468158632 100644
+index d09cead853..8dc4906b57 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -242,8 +242,10 @@ public class PurpurWorldConfig {
+@@ -240,8 +240,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean dispenserApplyCursedArmor = true;

patches/server/0109-Allow-anvil-colors.patch

@@ -35,10 +35,10 @@ index 4aa6b035a6..5e4e59e5c8 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7468158632..ae6031b849 100644
+index 8dc4906b57..e957d4f2df 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -218,6 +218,11 @@ public class PurpurWorldConfig {
+@@ -216,6 +216,11 @@ public class PurpurWorldConfig {
          });
      }