Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
821ce25d9 Significantly improve performance of the end generation
2b2e4fd65 Add Wandering Trader spawn rate config options
7263cbca7 [CI-SKIP] [Auto] Rebuild Patches
1c63aff6d Villager resetOffers API
8d8d74a5f Patch 2 references an invalid variable
e6d7bdca1 [CI-SKIP] fixed sed -i for bsd sed (#4782)
7ae47d4eb [CI-SKIP] Remove Waving banner fix (#4786)

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

@@ -13465,7 +13465,7 @@ index 5d9d58411..f0fdfd689 100644
          private double c;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f260da1fd..6cb47160d 100644
+index 9ed21f434..59abca0fd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -13511,7 +13511,7 @@ index f260da1fd..6cb47160d 100644
 +
      protected World(WorldDataMutable worlddatamutable, ResourceKey<World> resourcekey, final DimensionManager dimensionmanager, Supplier<GameProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((WorldDataServer) worlddatamutable).getName()); // Spigot
-         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig((((WorldDataServer)worlddatamutable).getName()), this.spigotConfig); // Paper
+         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((WorldDataServer) worlddatamutable).getName(), this.spigotConfig); // Paper
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
 +        this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((WorldDataServer)worlddatamutable).getName()); // Tuinity - Server Config
          this.generator = gen;

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

@@ -5,7 +5,7 @@ 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 8a19c9649..de75e33a6 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 {
@@ -29,7 +29,7 @@ index 8a19c96499..de75e33a68 100644
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fcba187bbd..c1eb8e8679 100644
+index fcba187bb..c1eb8e867 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -167,6 +167,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -48,8 +48,21 @@ index fcba187bbd..c1eb8e8679 100644
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          // Paper end
          com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
+diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
+index 0388d1099..3c20a4e1c 100644
+--- a/src/main/java/net/minecraft/server/EntityVillager.java
++++ b/src/main/java/net/minecraft/server/EntityVillager.java
+@@ -166,7 +166,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+     protected void mobTick() { mobTick(false); }
+     protected void mobTick(boolean inactive) {
+         this.world.getMethodProfiler().enter("villagerBrain");
+-        if (!inactive) this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper
++        if (!inactive) this.getBehaviorController().Wa((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper
+         this.world.getMethodProfiler().exit();
+         if (this.bF) {
+             this.bF = false;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f7103ec2a9..ab8fad689a 100644
+index 59abca0fd..ca4d260e8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -63,7 +76,7 @@ index f7103ec2a9..ab8fad689a 100644
 @@ -154,8 +155,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      protected World(WorldDataMutable worlddatamutable, ResourceKey<World> resourcekey, final DimensionManager dimensionmanager, Supplier<GameProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((WorldDataServer) worlddatamutable).getName()); // Spigot
-         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig((((WorldDataServer)worlddatamutable).getName()), this.spigotConfig); // Paper
+         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((WorldDataServer) worlddatamutable).getName(), this.spigotConfig); // Paper
 -        this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
          this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((WorldDataServer)worlddatamutable).getName()); // Tuinity - Server Config
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((WorldDataServer)worlddatamutable).getName())); // Purpur
@@ -73,7 +86,7 @@ index f7103ec2a9..ab8fad689a 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..1d00832bff
+index 000000000..1d00832bf
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -0,0 +1,130 @@
@@ -209,7 +222,7 @@ index 0000000000..1d00832bff
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 0000000000..361f7857e4
+index 000000000..361f7857e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -0,0 +1,59 @@
@@ -274,7 +287,7 @@ index 0000000000..361f7857e4
 +}
 diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 new file mode 100644
-index 0000000000..4904be939c
+index 000000000..4904be939
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 @@ -0,0 +1,65 @@
@@ -344,7 +357,7 @@ index 0000000000..4904be939c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 260d3513ec..51ef4ab09e 100644
+index 260d3513e..51ef4ab09 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -857,6 +857,7 @@ public final class CraftServer implements Server {
@@ -391,7 +404,7 @@ index 260d3513ec..51ef4ab09e 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a9c96d45c6..b65629cac7 100644
+index a9c96d45c..b65629cac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -146,6 +146,14 @@ public class Main {

patches/server/0017-Villager-resetOffers.patch

@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Mon, 7 Oct 2019 00:15:37 -0500
-Subject: [PATCH] Villager#resetOffers
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index 68fd780bc..ced893452 100644
---- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-@@ -85,6 +85,13 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP
-         return this.tradingPlayer != null;
-     }
- 
-+    // Purpur start
-+    public void resetOffers() {
-+        this.trades = new MerchantRecipeList();
-+        this.updateTrades();
-+    }
-+    // Purpur end
-+
-     @Override
-     public MerchantRecipeList getOffers() {
-         if (this.trades == null) {
-@@ -207,6 +214,7 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP
-         return this.world;
-     }
- 
-+    protected void updateTrades() { eW(); } // Purpur
-     protected abstract void eW();
- 
-     protected void a(MerchantRecipeList merchantrecipelist, VillagerTrades.IMerchantRecipeOption[] avillagertrades_imerchantrecipeoption, int i) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index d24a892c4..abfa6340f 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -169,4 +169,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
-         getHandle().getReputation().getReputations().clear();
-     }
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public void resetOffers() {
-+        getHandle().resetOffers();
-+    }
-+    // Purpur end
- }

patches/server/0019-EntityMoveEvent.patch

@@ -5,7 +5,7 @@ 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..5228a11a55 100644
+index 27e6d39a2..5228a11a5 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 {

patches/server/0020-Player-invulnerabilities.patch

@@ -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 1faefcb5d..9aa6998c6 100644
+index a86a4467a..6648d82d4 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 {
@@ -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 93c8f9fc8..21dc18c65 100644
+index 37f325d3a..57bde0db3 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/0022-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 c10ff09dd..f880a38bf 100644
+index 3c20a4e1c..a02f54ab3 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
@@ -24,17 +24,19 @@ index c10ff09dd..f880a38bf 100644
      }
  
      @Override
-@@ -166,6 +168,10 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -166,7 +168,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
      protected void mobTick() { mobTick(false); }
      protected void mobTick(boolean inactive) {
          this.world.getMethodProfiler().enter("villagerBrain");
+-        if (!inactive) this.getBehaviorController().Wa((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper
 +        // Purpur start
 +        boolean tick = (world.getTime() + brainTickOffset) % world.purpurConfig.villagerBrainTicks == 0;
 +        if (((WorldServer) world).getMinecraftServer().lagging ? tick : world.purpurConfig.villagerUseBrainTicksOnlyWhenLagging || tick)
 +        // Purpur end
-         if (!inactive) this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper
++        if (!inactive) this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper
          this.world.getMethodProfiler().exit();
          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
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java

patches/server/0026-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 7ab013058..ef30731c2 100644
+index f322dccd8..5cb6bb896 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 {

patches/server/0029-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 b65629cac7..71f8435e4a 100644
+index b65629cac..71f8435e4 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/0030-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 c57e23e16b..92aa104dc5 100644
+index c57e23e16..92aa104dc 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 c57e23e16b..92aa104dc5 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 19b7d84675..0822179590 100644
+index 152f3cc5b..870868f0e 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 19b7d84675..0822179590 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 9f4f56c47e..8dce2aad77 100644
+index 9f4f56c47..8dce2aad7 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 9f4f56c47e..8dce2aad77 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 23007c9ccb..ba4a2bcfa0 100644
+index 23007c9cc..ba4a2bcfa 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,7 +146,7 @@ index 23007c9ccb..ba4a2bcfa0 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5228a11a55..76ff4dd90e 100644
+index 5228a11a5..76ff4dd90 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 {
@@ -159,7 +159,7 @@ index 5228a11a55..76ff4dd90e 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f403f9dc6c..f5004f221e 100644
+index f403f9dc6..f5004f221 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/0031-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 73ac27913..66bfebe1c 100644
+index 50442b3a4..b6c6b4d54 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

patches/server/0032-Zombie-horse-naturally-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 18e4fe468..c6f253d17 100644
+index 848b8d8c8..7ef1987c0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1048,12 +1048,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {

patches/server/0033-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 ad422dfaf..8338afa7c 100644
+index 79ef95507..eb4a0ef0e 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 {

patches/server/0034-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 a7456890e..98baf24bd 100644
+index 80a4a7175..25a9b7906 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 {

patches/server/0037-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 ef30731c2..c64bbde28 100644
+index 5cb6bb896..aea72b0db 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 {

patches/server/0038-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 56c119e8d1..8845afd83d 100644
+index 56c119e8d..8845afd83 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 56c119e8d1..8845afd83d 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 67ebcbe4da..4c379916d8 100644
+index 67ebcbe4d..4c379916d 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 67ebcbe4da..4c379916d8 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 fd552adb95..40bc4cc77b 100644
+index fd552adb9..40bc4cc77 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/0039-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 b59cbd70a..cd6d2e07e 100644
+index 914c6e48d..99f0bd8f8 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 {

patches/server/0040-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 45e989efd..26dee32bf 100644
+index 182469fd3..11a612fa3 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 {

patches/server/0041-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 aff8394524..a637ff4e99 100644
+index 66597c6e1..5cde0f0d3 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 aff8394524..a637ff4e99 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 95e801ce26..f01c74a2ea 100644
+index 95e801ce2..f01c74a2e 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/0046-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 ee94c2827c..7f52c39234 100644
+index ee94c2827..7f52c3923 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 ee94c2827c..7f52c39234 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d8bd7ffd5f..7d6c624ac2 100644
+index d8bd7ffd5..7d6c624ac 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/0047-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 15b886d9b..dfe615814 100644
+index 48997367a..95ee716fc 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;

patches/server/0048-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 47182c500..4f3f7cb42 100644
+index 38dc6086d..f853f6c42 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 {

patches/server/0049-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 6b2c5e8d4..0e74794d3 100644
+index de53af8c0..a5a218245 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 {

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

@@ -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 f21597743..2763cc943 100644
+index bc5cba307..3721bd745 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/0054-Disable-loot-drops-on-death-by-cramming.patch

@@ -5,7 +5,7 @@ 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 4f75fe92bb..ace0743eb1 100644
+index 4f75fe92b..ace0743eb 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 {
@@ -20,7 +20,7 @@ index 4f75fe92bb..ace0743eb1 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 4c3e13cf66..189b32a6f8 100644
+index 4c3e13cf6..189b32a6f 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/0056-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 fcf254bbae..79554e18fc 100644
+index fcf254bba..79554e18f 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 fcf254bbae..79554e18fc 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 a1dc171252..4d74d2d051 100644
+index 189b32a6f..11af56df6 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/0057-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 5d158e723..3752fd610 100644
+index e0118a971..ed8e91bf6 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/0061-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 c92a703da..36dd79fc5 100644
+index 6648d82d4..879866022 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/0063-Configurable-TPS-Catchup.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d74f5a226..046d3dd83 100644
+index dae788886..c5d2f1a41 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1005,7 +1005,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@@ -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 df2ebd364..a82c9ae41 100644
+index 1fddf7c77..488a6891d 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;

patches/server/0074-Add-option-to-disable-saving-projectiles-to-disk.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 5eb14c4cd..1bc8b11d9 100644
+index 83761ddf0..2cd99e64c 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -508,6 +508,7 @@ public class ChunkRegionLoader {
+@@ -532,6 +532,7 @@ public class ChunkRegionLoader {
  
                  while (iterator1.hasNext()) {
                      Entity entity = (Entity) iterator1.next();
@@ -17,7 +17,7 @@ index 5eb14c4cd..1bc8b11d9 100644
                      // Paper start
                      if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0bc12fa32..3f2adc228 100644
+index 01f4be387..f036ffc8a 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 3f2adc228..4763dca41 100644
+index f036ffc8a..e0532f145 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/0082-Add-5-second-tps-average-in-tps.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 046d3dd83..39fc43e1c 100644
+index c5d2f1a41..c9577e998 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -166,7 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@@ -233,7 +233,7 @@ index 6c1540998..8eadfae52 100644
          return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ee56f23d0..8f6948f52 100644
+index ca4d260e8..a8571dae8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1564,6 +1564,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

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

@@ -49,7 +49,7 @@ index 120bf8436..848a185c0 100644
  
                  return true;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index baa8d23a9..10a2d2a20 100644
+index a8571dae8..7a82a894b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1639,4 +1639,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Dispensers place anvils option
 
 
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 36aafc3b7..d43939077 100644
+index c9963c198..e3ba447eb 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -102,6 +102,7 @@ public enum EnumDirection implements INamable {

patches/server/0111-Add-no-tick-block-list.patch

@@ -22,7 +22,7 @@ index 4d1ac4e6b..483756316 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9b04b97b7..f3bc74d35 100644
+index 5bd432374..4f5b6e3cd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -313,14 +313,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {