Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly Paper Changes: 1c446c22 Fix CME when adding a passenger during Spawn events (#4616) f3927b25 Fix "Not a string" Map Conversion spam - Fixes #3901 1b64536b Clarify the JavaDocs for Entity.getEntitySpawnReason() in response to #4361 6b22219c Remove unnecessary space for provided plugins, fixes #4608 3ece9036 [CI-SKIP] [Auto] Rebuild Patches 551fac7e Fix deop kicking non-whitelisted player when white list is not enabled faf8eb03 Updated Upstream (CraftBukkit) (#4622)
2026-02-17 16:37:43 +01:00 · 2020-10-10 16:41:13 -05:00
parent 86a07695dc
commit d652384e4a
44 changed files with 52 additions and 71 deletions
--- a/2
+++ b/2
--- a/2
+++ b/2
@@ -1 +1 @@
-1.16.3--bfe85e2507e6b326b22182b30415805d94ec620f
+1.16.3--9472fd3116e17e8d344bb53186a61f7bac7ca5c7
--- a/patches/server/0095-ALlow-color-codes-in-books.patch
+++ b/patches/server/0095-ALlow-color-codes-in-books.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ALlow color codes in books


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3a7014d30..f3e2b6e6e 100644
+index 668bd7261c..de3d692084 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -937,12 +937,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
--- a/patches/server/0095-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch
+++ b/patches/server/0095-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 7 Jul 2020 14:31:12 -0500
-Subject: [PATCH] MC-171420 - Fix deop kicking non-whitelisted player when
- white list is not enabled
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 21d0f3d45..4b67c3d2f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1962,6 +1962,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         if (this.aM()) {
-             PlayerList playerlist = commandlistenerwrapper.getServer().getPlayerList();
-             WhiteList whitelist = playerlist.getWhitelist();
-+            if (!((DedicatedServer)getServer()).getDedicatedServerProperties().whiteList.get()) return; // Purpur - white list not enabled
-             List<EntityPlayer> list = Lists.newArrayList(playerlist.getPlayers());
-             Iterator iterator = list.iterator();
- 
--- a/patches/server/0096-Entity-lifespan.patch
+++ b/patches/server/0096-Entity-lifespan.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index fc1a1bc74..0ecc5bd28 100644
+index 78ee45767a..7465e867ba 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -92,7 +92,7 @@ index fc1a1bc74..0ecc5bd28 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f3e2b6e6e..ff4a45777 100644
+index de3d692084..f7a4ced160 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2132,6 +2132,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -104,7 +104,7 @@ index f3e2b6e6e..ff4a45777 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 4f1998d7e..6279d6bb1 100644
+index c0314fd6e1..de98b45cfa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,7 +5,7 @@ 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 11abe8a93..2e4859709 100644
+index 45a2979380..ca70050ce0 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 {
@@ -23,7 +23,7 @@ index 11abe8a93..2e4859709 100644
                     }
                 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6279d6bb1..a04e2f9d3 100644
+index de98b45cfa..5a38ee5bd9 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 {
--- a/patches/server/0098-Squid-EAR-immunity.patch
+++ b/patches/server/0098-Squid-EAR-immunity.patch
--- a/patches/server/0099-Configurable-end-spike-seed.patch
+++ b/patches/server/0099-Configurable-end-spike-seed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end spike seed


 diff --git a/src/main/java/net/minecraft/server/WorldGenEnder.java b/src/main/java/net/minecraft/server/WorldGenEnder.java
-index 00a170720..5eb9b3d35 100644
+index 00a1707209..5eb9b3d35e 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEnder.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEnder.java
@@ -23,12 +23,14 @@ public class WorldGenEnder extends WorldGenerator<WorldGenFeatureEndSpikeConfigu
@@ -25,7 +25,7 @@ index 00a170720..5eb9b3d35 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 9d5246de9..fa6298719 100644
+index 9d5246de95..fa62987191 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,5 +1,6 @@
--- a/patches/server/0100-Configurable-dungeon-seed.patch
+++ b/patches/server/0100-Configurable-dungeon-seed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable dungeon seed


 diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java
-index 07f7b69fe..6aa1626f3 100644
+index 07f7b69fef..6aa1626f38 100644
 --- a/src/main/java/net/minecraft/server/WorldGenDungeons.java
 +++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java
@@ -11,12 +11,21 @@ public class WorldGenDungeons extends WorldGenerator<WorldGenFeatureEmptyConfigu
@@ -31,7 +31,7 @@ index 07f7b69fe..6aa1626f3 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 fa6298719..60826d0d2 100644
+index fa62987191..60826d0d2d 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 {
--- a/patches/server/0101-Phantoms-burn-in-light.patch
+++ b/patches/server/0101-Phantoms-burn-in-light.patch
--- a/patches/server/0102-Configurable-villager-breeding.patch
+++ b/patches/server/0102-Configurable-villager-breeding.patch
--- a/patches/server/0103-Redstone-deactivates-spawners.patch
+++ b/patches/server/0103-Redstone-deactivates-spawners.patch
--- a/patches/server/0104-Totems-work-in-inventory.patch
+++ b/patches/server/0104-Totems-work-in-inventory.patch
@@ -5,7 +5,7 @@ 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 2e4859709..ad17c3d27 100644
+index ca70050ce0..a2d50a1fef 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 {
@@ -29,7 +29,7 @@ index 2e4859709..ad17c3d27 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 14ac36673..8935a32d5 100644
+index 7a37c63538..751a937d04 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 {
--- a/patches/server/0105-Fix-death-message-colors.patch
+++ b/patches/server/0105-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 2b22029ea..f8d959258 100644
+index c7be886e78..bc588af921 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -667,7 +667,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/patches/server/0106-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
+++ b/patches/server/0106-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ff4a45777..a8ec01687 100644
+index f7a4ced160..1ff07a08dc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1891,7 +1891,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
--- a/patches/server/0107-Populator-seed-controls.patch
+++ b/patches/server/0107-Populator-seed-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Populator seed controls


 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index dae2e5d70..55b67f105 100644
+index dae2e5d707..55b67f1057 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -293,7 +293,7 @@ public class TimingsExport extends Thread {
@@ -18,7 +18,7 @@ index dae2e5d70..55b67f105 100644
             }
             final Object val = config.get(key);
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 996be9b7f..1c6347420 100644
+index 996be9b7f1..1c63474206 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
@@ -1,5 +1,6 @@
@@ -62,7 +62,7 @@ index 996be9b7f..1c6347420 100644
 }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 0854ac9ef..df6874c1c 100644
+index 0854ac9ef5..df6874c1cf 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -189,6 +189,10 @@ public final class BiomeBase {
--- a/patches/server/0108-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0108-Add-vindicator-johnny-spawn-chance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add vindicator johnny spawn chance


 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index fd34d88c0..a945a0a07 100644
+index fd34d88c0b..a945a0a073 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -81,6 +81,12 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -22,7 +22,7 @@ index fd34d88c0..a945a0a07 100644
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8935a32d5..3e28dc772 100644
+index 751a937d04..bc3c96229f 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 {
--- a/patches/server/0109-DragonEggPlaceEvent.patch
+++ b/patches/server/0109-DragonEggPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] DragonEggPlaceEvent


 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 4f3f7cb42..f29edc410 100644
+index 4f3f7cb421..f29edc4108 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -359,7 +359,13 @@ public class EnderDragonBattle {
--- a/patches/server/0110-Add-option-to-disable-mushroom-block-updates.patch
+++ b/patches/server/0110-Add-option-to-disable-mushroom-block-updates.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable mushroom block updates


 diff --git a/src/main/java/net/minecraft/server/BlockHugeMushroom.java b/src/main/java/net/minecraft/server/BlockHugeMushroom.java
-index e8f340b9f..3490af6fe 100644
+index e8f340b9f2..3490af6fe0 100644
 --- a/src/main/java/net/minecraft/server/BlockHugeMushroom.java
 +++ b/src/main/java/net/minecraft/server/BlockHugeMushroom.java
@@ -14,30 +14,57 @@ public class BlockHugeMushroom extends Block {
@@ -73,7 +73,7 @@ index e8f340b9f..3490af6fe 100644
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 60826d0d2..bef137935 100644
+index 60826d0d2d..bef1379357 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 {
--- a/patches/server/0111-Dispensers-place-anvils-option.patch
+++ b/patches/server/0111-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 36aafc3b71..d439390777 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 {
@@ -33,7 +33,7 @@ index 36aafc3b7..d43939077 100644
         return this.k;
     }
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index 7b8a470d9..d1f9d2884 100644
+index 7b8a470d97..d1f9d2884d 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
@@ -915,6 +915,23 @@ public interface IDispenseBehavior {
@@ -61,7 +61,7 @@ index 7b8a470d9..d1f9d2884 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 3e28dc772..6cbf0baa6 100644
+index bc3c96229f..38a71b2469 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 {
--- a/patches/server/0112-Allow-anvil-colors.patch
+++ b/patches/server/0112-Allow-anvil-colors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow anvil colors


 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 4aa6b035a..5e4e59e5c 100644
+index 4aa6b035a6..5e4e59e5c8 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
@@ -251,6 +251,25 @@ public class ContainerAnvil extends ContainerAnvilAbstract {
@@ -35,7 +35,7 @@ index 4aa6b035a..5e4e59e5c 100644
             }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6cbf0baa6..6d1bb8f3e 100644
+index 38a71b2469..10cefd8547 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 {
--- a/patches/server/0113-Add-no-tick-block-list.patch
+++ b/patches/server/0113-Add-no-tick-block-list.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add no-tick block list


 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index 2db488aba..68fd93ddd 100644
+index 9d85ce027a..2165de63b1 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -572,10 +572,12 @@ public abstract class BlockBase {
@@ -22,7 +22,7 @@ index 2db488aba..68fd93ddd 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 53ab03a29..e4f2b8494 100644
+index e2f714382c..34a4ae5ce0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -305,14 +305,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -43,7 +43,7 @@ index 53ab03a29..e4f2b8494 100644
             this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
                 return fluidtype == null || fluidtype == FluidTypes.EMPTY;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6d1bb8f3e..fd100a9cc 100644
+index 10cefd8547..0a9d75e82a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection;
--- a/patches/server/0114-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/server/0114-Add-option-to-disable-dolphin-treasure-searching.patch
--- a/patches/server/0115-Add-option-to-reset-reputation-when-villager-is-cure.patch
+++ b/patches/server/0115-Add-option-to-reset-reputation-when-villager-is-cure.patch
--- a/patches/server/0116-Short-enderman-height.patch
+++ b/patches/server/0116-Short-enderman-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Short enderman height


 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index b45a75a45..fde60d6c8 100644
+index b45a75a451..fde60d6c89 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -321,6 +321,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
@@ -17,7 +17,7 @@ index b45a75a45..fde60d6c8 100644
             if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
             for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index c03b0b58b..e52b23fa7 100644
+index b089c8a3f1..7e55134410 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -34,7 +34,7 @@ public class EntityTypes<T extends Entity> {
@@ -30,7 +30,7 @@ index c03b0b58b..e52b23fa7 100644
     public static final EntityTypes<EntityEvoker> EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8));
     public static final EntityTypes<EntityEvokerFangs> EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bef137935..8714d1574 100644
+index bef1379357..8714d1574d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -190,6 +190,11 @@ public class PurpurConfig {
--- a/patches/server/0117-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0117-Stop-squids-floating-on-top-of-water.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d7ac23524a..b1c7231bbe 100644
+index 08ceba1559..2b2911ca8e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3417,8 +3417,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/patches/server/0118-Ridables.patch
+++ b/patches/server/0118-Ridables.patch
@@ -161,7 +161,7 @@ index bd0267ee4b..8b36ac2b09 100644
         this.B = true;
         return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b1c7231bbe..e2de67783c 100644
+index 2b2911ca8e..48cd541912 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/patches/server/0119-Use-configured-height-for-nether-surface-builders.patch
+++ b/patches/server/0119-Use-configured-height-for-nether-surface-builders.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use configured height for nether surface builders


 diff --git a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
-index 462f0b2ba..f418a71ca 100644
+index 462f0b2bae..f418a71ca8 100644
 --- a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
 +++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
@@ -35,7 +35,7 @@ public abstract class WorldGenSurfaceNetherAbstract extends WorldGenSurface<Worl
--- a/patches/server/0120-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0120-Crying-obsidian-valid-for-portal-frames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Crying obsidian valid for portal frames


 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 372ee6adc..4aa2b38f1 100644
+index 372ee6adce..4aa2b38f18 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -100,6 +100,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -17,7 +17,7 @@ index 372ee6adc..4aa2b38f1 100644
         return this == block;
     }
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index 68fd93ddd..d727be7de 100644
+index 2165de63b1..5f0db96440 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -642,6 +642,7 @@ public abstract class BlockBase {
@@ -29,7 +29,7 @@ index 68fd93ddd..d727be7de 100644
             return this.getBlock().a(block);
         }
 diff --git a/src/main/java/net/minecraft/server/BlockPortalShape.java b/src/main/java/net/minecraft/server/BlockPortalShape.java
-index 6ef81aeb4..9ea3c30b6 100644
+index 6ef81aeb4c..9ea3c30b67 100644
 --- a/src/main/java/net/minecraft/server/BlockPortalShape.java
 +++ b/src/main/java/net/minecraft/server/BlockPortalShape.java
@@ -14,7 +14,7 @@ import org.bukkit.event.world.PortalCreateEvent;
@@ -42,7 +42,7 @@ index 6ef81aeb4..9ea3c30b6 100644
     private final GeneratorAccess b;
     private final EnumDirection.EnumAxis c;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index af3739c79..d33d24af6 100644
+index af3739c79a..d33d24af65 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -176,6 +176,7 @@ public class PurpurConfig {
--- a/patches/server/0121-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0121-Entities-can-use-portals-configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 976faf3bf1..5e47208375 100644
+index 48cd541912..deaa8b8371 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2390,7 +2390,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -27,7 +27,7 @@ index 976faf3bf1..5e47208375 100644
 
     public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a0684f16cb..255600f194 100644
+index 0f1be67e16..4d6dc69def 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -138,6 +138,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0122-LivingEntity-broadcastItemBreak.patch
+++ b/patches/server/0122-LivingEntity-broadcastItemBreak.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2fd4bc818..9f765ecd7 100644
+index 2fd4bc818a..9f765ecd7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -820,5 +820,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
--- a/patches/server/0123-Customizable-WitherBoss-Health-and-Healing.patch
+++ b/patches/server/0123-Customizable-WitherBoss-Health-and-Healing.patch
--- a/patches/server/0124-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0124-Allow-toggling-special-MobSpawners-per-world.patch
@@ -29,7 +29,7 @@ index 502cb0ea40..f88c7b5480 100644
             if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
                 blockposition1 = blockposition2;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d13684c3d7..902a7efb03 100644
+index c3dbe78027..dcf03067e1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -128,7 +128,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -42,7 +42,7 @@ index d13684c3d7..902a7efb03 100644
         this.generator = gen;
         this.world = new CraftWorld((WorldServer) this, gen, env);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index bdb485b2cc..6644686908 100644
+index 34a4ae5ce0..0fb41962c8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -322,7 +322,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -72,7 +72,7 @@ index bdb485b2cc..6644686908 100644
         this.worldDataServer = (WorldDataServer) iworlddataserver;
         worldDataServer.world = this;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 54319b0979..85ce7dbc8f 100644
+index 66c9da792c..d8c5e033fc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry;
--- a/patches/server/0125-Raid-cooldown-setting.patch
+++ b/patches/server/0125-Raid-cooldown-setting.patch
@@ -52,7 +52,7 @@ index 2193fecab4..515026198c 100644
                     if (!this.raids.containsKey(raid.getId())) {
                         this.raids.put(raid.getId(), raid);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 85ce7dbc8f..423593ae66 100644
+index d8c5e033fc..6c1038e2d9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -155,6 +155,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch
@@ -300,7 +300,7 @@ index 9a17eb6066..f0b8982893 100644
 
     public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 423593ae66..67b8996671 100644
+index 6c1038e2d9..52e6e11a56 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,6 +145,35 @@ public class PurpurWorldConfig {
--- a/patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
+++ b/patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
--- a/patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
+++ b/patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Add hex color code support for console logging


 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-index 685deaa0e..73c2bdd58 100644
+index 685deaa0e5..73c2bdd587 100644
 --- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
@@ -1,17 +1,52 @@
--- a/patches/server/0129-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0129-Add-option-to-disable-zombie-aggressiveness-towards-.patch
--- a/patches/server/0130-Persistent-TileEntity-Lore-and-DisplayName.patch
+++ b/patches/server/0130-Persistent-TileEntity-Lore-and-DisplayName.patch
@@ -160,7 +160,7 @@ index d32540c88b..13460df026 100644
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index caef18518b..a36989d2b3 100644
+index d6b91bc003..af7c495da1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -182,6 +182,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/server/0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
--- a/patches/server/0132-Flying-squids-Oh-my.patch
+++ b/patches/server/0132-Flying-squids-Oh-my.patch
--- a/patches/server/0133-Infinity-bow-settings.patch
+++ b/patches/server/0133-Infinity-bow-settings.patch
--- a/patches/server/0134-Stonecutter-damage.patch
+++ b/patches/server/0134-Stonecutter-damage.patch
--- a/patches/server/0135-Configurable-daylight-cycle.patch
+++ b/patches/server/0135-Configurable-daylight-cycle.patch