Updated Upstream and Sidestream(s) (Paper/Purpur/AirplaneLite) (#362)

* Updated Upstream and Sidestream(s) (Paper/Purpur/AirplaneLite) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: fc4c0bc42 Reset shield blocking on dimension change 1c8b6065e Skip distance map update when spawning is disabled 091e6700f Added PlayerStonecutterRecipeSelectEvent fc885f966 Add toggle for always placing the dragon egg b3a6da3a7 Updated Upstream (Bukkit/CraftBukkit) 18ccc062d [Auto] Updated Upstream (Spigot) Purpur Changes: df9bd08 Config to use infinity bows without arrows (#149) 9d537bc Fix PlayerEditBookEvent not saving new book 3f8816d [ci-skip] Oops 5508728 [ci-skip] Add granny to funding 4c7ab70 Updated Upstream (Paper) 5eefb52 [ci-skip] Update Gradle to 6.8.1 AirplaneLite Changes: 459bb20 Remove patch 515fec7 Remove streams fc94d7b Correct launcher name 0b153bd Update gradle version * add Remove-streams.patch from AirplaneLite
2024-11-22 02:25:51 +01:00 · 2021-01-25 14:22:51 -05:00 · 2021-01-25 14:22:51 -05:00 · d059af01b6
commit d059af01b6
parent 620a24c155
166 changed files with 486 additions and 411 deletions
--- a/PATCHES.md
+++ b/PATCHES.md
@ -101,6 +101,7 @@ # Patches
 | server |  Config migration: climbing should not bypass cramming      | jmp |  |
 | server |  Config migration: disable saving projectiles to disk -&gt;      | jmp |  |
 | server |  Config to allow Note Block sounds when blocked      | Encode42 |  |
+| server |  Config to use infinity bows without arrows      | Encode42 |  |
 | server |  Configurable BlockPhysicsEvent      | Mykyta Komarnytskyy |  |
 | server |  Configurable TPS Catchup      | William Blake Galbreath |  |
 | server |  Configurable chance for wolves to spawn rabid      | Encode42 |  |
@ -140,7 +141,6 @@ # Patches
 | server |  Do not allow ticket level changes while unloading      | Spottedleaf |  |
 | server |  Do not load chunks during a crash report      | Spottedleaf |  |
 | server |  Do not retain playerchunkmap instance in light thread factory      | Spottedleaf |  |
-| server |  Do not update distance map when animal and mob spawning is      | Beech Horn |  |
 | server |  Don&#39;t allow StructureLocateEvent to change worlds      | Spottedleaf |  |
 | server |  Don&#39;t get entity equipment if not needed      | Paul Sauve |  |
 | server |  Don&#39;t load chunk with seed based feature search      | Phoenix616 |  |
@ -155,7 +155,6 @@ # Patches
 | server |  EMC - MonsterEggSpawnEvent      | Aikar |  |
 | api |  EMC - MonsterEggSpawnEvent      | Aikar |  |
 | server |  End gateway should check if entity can use portal      | William Blake Galbreath |  |
-| server |  Ender dragon always drop egg      | William Blake Galbreath |  |
 | server |  Ender dragon always drop full exp      | William Blake Galbreath |  |
 | server |  Ensure pools create daemon threads      | Ivan Pekov |  |
 | server |  Entities can use portals configuration      | William Blake Galbreath |  |
@ -170,6 +169,7 @@ # Patches
 | server |  Fix Bukkit.createInventory() with type LECTERN      | willies952002 |  |
 | server |  Fix IndexOutOfBoundsException when sending too many changes      | Ivan Pekov |  |
 | server |  Fix LightEngineThreaded memory leak      | Ivan Pekov |  |
+| server |  Fix PlayerEditBookEvent not saving new book      | BillyGalbreath |  |
 | server |  Fix cow rotation when shearing mooshroom      | William Blake Galbreath |  |
 | server |  Fix death message colors      | William Blake Galbreath |  |
 | server |  Fix exp drop of zombie pigmen (MC-56653)      | Phoenix616 |  |
@ -180,6 +180,7 @@ # Patches
 | server |  Fix swamp hut cat generation deadlock      | Spottedleaf |  |
 | server |  Fix the dead lagging the server      | William Blake Galbreath |  |
 | server |  Fix vanilla command permission handler      | William Blake Galbreath |  |
+| server |  Flying squids! Oh my!      | William Blake Galbreath |  |
 | server |  Full netherite armor grants fire resistance      | BillyGalbreath |  |
 | api |  Full netherite armor grants fire resistance      | BillyGalbreath |  |
 | server |  Giants AI settings      | William Blake Galbreath |  |
@ -201,7 +202,6 @@ # Patches
 | server |  Improve paper prevent moving into unloaded chunk check      | Spottedleaf |  |
 | server |  Improved oversized chunk data packet handling      | Spottedleaf |  |
 | server |  Infinite fuel furnace      | William Blake Galbreath |  |
-| server |  Infinity No Arrows      | Zoe |  |
 | server |  Infinity bow settings      | William Blake Galbreath |  |
 | server |  Item entity immunities      | William Blake Galbreath |  |
 | api |  Item entity immunities      | William Blake Galbreath |  |
@ -310,6 +310,7 @@ # Patches
 | server |  Reduce pathfinder branches      | Spottedleaf |  |
 | server |  Reduce projectile chunk loading      | Paul Sauve |  |
 | server |  Remove some streams and object allocations      | Phoenix616 |  |
+| server |  Remove streams      | Paul Sauve |  |
 | server |  Remove streams for villager AI      | Spottedleaf |  |
 | server |  Respect PlayerKickEvent leaveMessage      | Ivan Pekov |  |
 | server |  Revert MC-4 fix      | Spottedleaf |  |
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e9a87b72be44783eca7bfc0eba9fad61d70f0f90
+Subproject commit fc4c0bc42e32809eabf37bf378f16b394a71eae0
--- a/patches/AirplaneLite/patches/server/0002-Remove-streams.patch
+++ b/patches/AirplaneLite/patches/server/0002-Remove-streams.patch
@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paul Sauve <paul@technove.co>
+Date: Sat, 23 Jan 2021 16:42:24 -0600
+Subject: [PATCH] Remove streams
+
+
+diff --git a/src/main/java/net/minecraft/server/BehaviorBetterJob.java b/src/main/java/net/minecraft/server/BehaviorBetterJob.java
+index 19f8cf4384ff7a1515ad33a5f573ea0061bab93d..e6507a9bef705e1496497ad6b58a546348a0779e 100644
+--- a/src/main/java/net/minecraft/server/BehaviorBetterJob.java
+++ b/src/main/java/net/minecraft/server/BehaviorBetterJob.java
+@@ -14,11 +14,31 @@ public class BehaviorBetterJob extends Behavior<EntityVillager> {
+     protected void a(WorldServer worldserver, EntityVillager entityvillager, long i) {
+         GlobalPos globalpos = (GlobalPos) entityvillager.getBehaviorController().getMemory(MemoryModuleType.JOB_SITE).get();
+ 
+        // Airplane start - remove stream
+        /*
+         worldserver.y().c(globalpos.getBlockPosition()).ifPresent((villageplacetype) -> {
+             BehaviorUtil.a(entityvillager, (entityvillager1) -> {
+                 return this.a(globalpos, villageplacetype, entityvillager1);
+             }).reduce(entityvillager, BehaviorBetterJob::a);
+         });
+         */
+        java.util.Optional<VillagePlaceType> optVillagePlaceType = worldserver.y().c(globalpos.getBlockPosition());
+        if (optVillagePlaceType.isPresent()) {
+            VillagePlaceType villageplacetype = optVillagePlaceType.get();
+            java.util.Optional<java.util.List<EntityLiving>> optList = entityvillager.getBehaviorController().getMemory(MemoryModuleType.MOBS);
+            if (optList.isPresent()) {
+                EntityVillager previous = entityvillager;
+                for (EntityLiving entityliving : optList.get()) {
+                    if (entityliving instanceof EntityVillager && entityliving != entityvillager && entityliving.isAlive()) {
+                        EntityVillager entityvillager1 = (EntityVillager) entityliving;
+                        if (this.a(globalpos, villageplacetype, entityvillager1)) {
+                            previous = a(previous, entityvillager1);
+                        }
+                    }
+                }
+            }
+        }
+        // Airplane end
+     }
+ 
+     private static EntityVillager a(EntityVillager entityvillager, EntityVillager entityvillager1) {
--- a/patches/AirplaneLite/patches/server/0003-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/AirplaneLite/patches/server/0003-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
--- a/patches/AirplaneLite/patches/server/0004-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch
+++ b/patches/AirplaneLite/patches/server/0004-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch
--- a/patches/AirplaneLite/patches/server/0005-Queue-lighting-update-only-once.patch
+++ b/patches/AirplaneLite/patches/server/0005-Queue-lighting-update-only-once.patch
@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 38ca1c042afd41a1f660f88e398fedde00f34e39..45db17d2f415197849c1fac5adce46d893e2a81d 100644
+index 9e6381a60b804a957eda5b72582d5545faebcb3e..0dddb334c70b4692c1a83544c3d18dcf154c6c18 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -996,6 +996,7 @@ public class ChunkProviderServer extends IChunkProvider {
--- a/patches/AirplaneLite/patches/server/0006-Use-unmodifiableMap-instead-of-making-copy.patch
+++ b/patches/AirplaneLite/patches/server/0006-Use-unmodifiableMap-instead-of-making-copy.patch
--- a/patches/AirplaneLite/patches/server/0007-Swap-priority-of-checks-in-chunk-ticking.patch
+++ b/patches/AirplaneLite/patches/server/0007-Swap-priority-of-checks-in-chunk-ticking.patch
--- a/patches/AirplaneLite/patches/server/0008-Reduce-projectile-chunk-loading.patch
+++ b/patches/AirplaneLite/patches/server/0008-Reduce-projectile-chunk-loading.patch
--- a/patches/AirplaneLite/patches/server/0009-Optimize-random-calls-in-chunk-ticking.patch
+++ b/patches/AirplaneLite/patches/server/0009-Optimize-random-calls-in-chunk-ticking.patch
@ -56,7 +56,7 @@ index ae07ea2a34f5cd82ce2eae523359cb7540065335..8b7fd21e6b366196fbc9cd44a340335c
         this(world, chunkcoordintpair, biomestorage, ChunkConverter.a, TickListEmpty.b(), TickListEmpty.b(), 0L, (ChunkSection[]) null, (Consumer) null);
     }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 45db17d2f415197849c1fac5adce46d893e2a81d..ce2864f44dcc2003a85f7a211073b2b0bb617cd2 100644
+index 0dddb334c70b4692c1a83544c3d18dcf154c6c18..23cea240ed7d8937df49a9c3e24191cb785ad730 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -965,6 +965,7 @@ public class ChunkProviderServer extends IChunkProvider {
--- a/patches/AirplaneLite/patches/server/0010-Don-t-get-entity-equipment-if-not-needed.patch
+++ b/patches/AirplaneLite/patches/server/0010-Don-t-get-entity-equipment-if-not-needed.patch
--- a/patches/Purpur/patches/server/0008-AFK-API.patch
+++ b/patches/Purpur/patches/server/0008-AFK-API.patch
@ -25,10 +25,10 @@ index 9796b4e57d6680c9f0dc76decdd985572daafb7e..f15ec5c45d95c6828ed628451917ac34
         super(EntityTypes.PLAYER, world);
         this.bL = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9f5b7243ccbe0729a061345c25033d9145b91b3f..6bab47ab2583735c36d74d849ab0923494a265db 100644
+index 2797941b53fa47316f90a86c8b2b4c2f059df223..a801975db7efeb961e8e69d2998962e6c397c07a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1904,8 +1904,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1909,8 +1909,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     public void resetIdleTimer() {
         this.ca = SystemUtils.getMonotonicMillis();
--- a/patches/Purpur/patches/server/0017-Player-invulnerabilities.patch
+++ b/patches/Purpur/patches/server/0017-Player-invulnerabilities.patch
@ -2,10 +2,15 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 2 May 2020 20:55:44 -0500
 Subject: [PATCH] Player invulnerabilities
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit

+ ~/m/Y/Y/Yatopia-Server   Purpur-server  
+git diff 92c905f952344875c7d00766f45cd8fb228cdef2 78a263e978c5dfdb26e09dd72b25d9d3dc0b1c8b

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6bab47ab2583735c36d74d849ab0923494a265db..6e292d91d509327fa5b9dea947811d04e78e1e93 100644
+index a801975db7efeb961e8e69d2998962e6c397c07a..5003ac5cb4921c6fb385a2ac2886c5e95912e34f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -150,6 +150,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -39,15 +44,15 @@ index 6bab47ab2583735c36d74d849ab0923494a265db..6e292d91d509327fa5b9dea947811d04
                 return false;
             } else {
                 if (damagesource instanceof EntityDamageSource) {
-@@ -1169,6 +1177,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-                 // CraftBukkit end
+@@ -1174,6 +1182,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             }
+             // Paper end
 
 +            this.invulnerableTicks = worldserver.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
             return this;
         }
     }
-@@ -2322,9 +2331,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2327,9 +2336,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     @Override
     public boolean isFrozen() { // Paper - protected > public
--- a/patches/Purpur/patches/server/0044-Ender-dragon-always-drop-egg.patch
+++ b/patches/Purpur/patches/server/0044-Ender-dragon-always-drop-egg.patch
@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 7 Feb 2020 04:42:57 -0600
-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 38dc6086d18951e065d4048d1d8eee288c5c5fd1..f853f6c424da77c40ee3d5b5dc2279ba8918977c 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 {
-             this.bossBattle.setVisible(false);
-             this.generateExitPortal(true);
-             this.n();
-            if (!this.previouslyKilled) {
-+            if (this.world.purpurConfig.enderDragonAlwaysDropsEggBlock || !this.previouslyKilled) { // Purpur - always place dragon egg
-                 this.world.setTypeUpdate(this.world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a), Blocks.DRAGON_EGG.getBlockData());
-             }
- 
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6d93ff4b08582f0f3ea1bb4b582aaa881651d34d..bafead429f2ca19033a63241ff24b16f597f7678 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 {
-         creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
-     }
- 
-+    public boolean enderDragonAlwaysDropsEggBlock = false;
-+    private void enderDragonSettings() {
-+        enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender_dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
-+    }
-+
-     public boolean foxTypeChangesWithTulips = false;
-     private void foxSettings() {
-         foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
--- a/patches/Purpur/patches/server/0044-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/Purpur/patches/server/0044-Ender-dragon-always-drop-full-exp.patch
@ -18,17 +18,18 @@ index de53af8c01f8fa9636386737b6bc071b32f87cd1..a5a2182455542bb8fd62941bd0da2f38
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bafead429f2ca19033a63241ff24b16f597f7678..1623e65adf402269748cc06e8f2a42dcf411babb 100644
+index 6d93ff4b08582f0f3ea1bb4b582aaa881651d34d..55cc0c4bafe35b9d8bb15bd017d5ea429a427e60 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 {
+@@ -142,6 +142,11 @@ public class PurpurWorldConfig {
+         creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
     }
 
-     public boolean enderDragonAlwaysDropsEggBlock = false;
 +    public boolean enderDragonAlwaysDropsFullExp = false;
-     private void enderDragonSettings() {
-         enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender_dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+    private void enderDragonSettings() {
 +        enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
-     }
- 
+    }
+
     public boolean foxTypeChangesWithTulips = false;
+     private void foxSettings() {
+         foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
--- a/patches/Purpur/patches/server/0045-Signs-editable-on-right-click.patch
+++ b/patches/Purpur/patches/server/0045-Signs-editable-on-right-click.patch
@ -39,7 +39,7 @@ index 2b9d5724c1b63f5e55010f9e3450004821c098a4..316766970243e8ac00e4c82f6c710de5
         // 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 1623e65adf402269748cc06e8f2a42dcf411babb..02587d8609b8aa8d2a48c38372f5c245878fe15e 100644
+index 55cc0c4bafe35b9d8bb15bd017d5ea429a427e60..e5a160ef0a193445cf42f1569109a502d2fe52d4 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 {
--- a/patches/Purpur/patches/server/0046-Signs-allow-color-codes.patch
+++ b/patches/Purpur/patches/server/0046-Signs-allow-color-codes.patch
@ -5,10 +5,10 @@ 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 6e292d91d509327fa5b9dea947811d04e78e1e93..46e06a5cf6e7fda62fe84f53db35f143e8f5d676 100644
+index 5003ac5cb4921c6fb385a2ac2886c5e95912e34f..9eace2d1cdf3304c122f86630a5b4c5bcaa520d4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1429,6 +1429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1434,6 +1434,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     @Override
     public void openSign(TileEntitySign tileentitysign) {
@ -59,7 +59,7 @@ index 316766970243e8ac00e4c82f6c710de5edc3fa51..852bb5db84ddd735f5e0d7f922918cc9
     @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 02587d8609b8aa8d2a48c38372f5c245878fe15e..77ab4cbbb08618fa72b264ebfb5f7211eec9af42 100644
+index e5a160ef0a193445cf42f1569109a502d2fe52d4..e73b493c67b53273330dbf7abbda2ace54a169f4 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 {
--- a/patches/Purpur/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/Purpur/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch
@ -36,7 +36,7 @@ index a315e2628c35ee713b68741c6e52c4b140c05f27..8dd48669c29dd51ed4d535dad0b0319f
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 77ab4cbbb08618fa72b264ebfb5f7211eec9af42..ce7b3775d81135a785599d1866a8fe88f897eff7 100644
+index e73b493c67b53273330dbf7abbda2ace54a169f4..3cc9fcfe0945e7c56c9e74ef273baf3dfc4b53f6 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 {
--- a/patches/Purpur/patches/server/0048-Controllable-Minecarts.patch
+++ b/patches/Purpur/patches/server/0048-Controllable-Minecarts.patch
@ -106,7 +106,7 @@ index 022dfdc5b6af4b243e7e4da8660e8e41d04e1a30..298af30b1a7f12d42216fc1b7ee801fd
         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 46e06a5cf6e7fda62fe84f53db35f143e8f5d676..e0a2057b3e9915092f0d973d512821448aa30d18 100644
+index 9eace2d1cdf3304c122f86630a5b4c5bcaa520d4..18a968be4d3b505dc7d8a72f58ee0a9222482885 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1004,6 +1004,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -143,7 +143,7 @@ index ceef7aaf923026ff1044d6feba4297279eb44157..002651aaf3b8a9b489fe323756cd1ad1
     }
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ce7b3775d81135a785599d1866a8fe88f897eff7..7bb80ab8fde39f39a0834e4ed2d3002e73885737 100644
+index 3cc9fcfe0945e7c56c9e74ef273baf3dfc4b53f6..248a5c0c5142cde9dec0d7c1de665b0c37fa3e8c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,5 +1,7 @@
--- a/patches/Purpur/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/Purpur/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
@ -20,7 +20,7 @@ index 4bd1322892e1c46addd795254d9ae6d3e7dc1e5b..bef80c83c551abe2cc23cf73e6c73731
         // 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 7bb80ab8fde39f39a0834e4ed2d3002e73885737..dde6877f175d6a80d86f78ce25aa4626cdd6bbe5 100644
+index 248a5c0c5142cde9dec0d7c1de665b0c37fa3e8c..6b3c1a07497f8c5f06ac7ed7df31fc8224f94007 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 {
--- a/patches/Purpur/patches/server/0050-Players-should-not-cram-to-death.patch
+++ b/patches/Purpur/patches/server/0050-Players-should-not-cram-to-death.patch
@ -5,10 +5,10 @@ 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 e0a2057b3e9915092f0d973d512821448aa30d18..5c81b2ad016325b1b04b7da489c413ee2e5128d2 100644
+index 18a968be4d3b505dc7d8a72f58ee0a9222482885..074389c45965df5ab0803103e1dfc39f6fdc8cb0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1406,7 +1406,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1411,7 +1411,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     @Override
     public boolean isInvulnerable(DamageSource damagesource) {
--- a/patches/Purpur/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/Purpur/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch
@ -19,7 +19,7 @@ index fcf254bbaeb3c0ffdb6834a8d5ad2c3cf4235e5b..79554e18fc39ecd9db87618a59d2e670
 
         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 dde6877f175d6a80d86f78ce25aa4626cdd6bbe5..c60a3d7d9057e665023e464f62a3c2ea9ccd8b41 100644
+index 6b3c1a07497f8c5f06ac7ed7df31fc8224f94007..b2ad6265a9e2bb16592fb9719339be83d92ff82b 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 {
--- a/patches/Purpur/patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/Purpur/patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch
--- a/patches/Purpur/patches/server/0053-Fix-the-dead-lagging-the-server.patch
+++ b/patches/Purpur/patches/server/0053-Fix-the-dead-lagging-the-server.patch
--- a/patches/Purpur/patches/server/0054-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/Purpur/patches/server/0054-Skip-events-if-there-s-no-listeners.patch
--- a/patches/Purpur/patches/server/0055-Add-permission-for-F3-N-debug.patch
+++ b/patches/Purpur/patches/server/0055-Add-permission-for-F3-N-debug.patch
--- a/patches/Purpur/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch
+++ b/patches/Purpur/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch
@ -17,10 +17,10 @@ index 1ae9910fefece1a3fe6410b27642da6edd8f296d..c872be77a6cd767520d5412b38ec4ed4
     }
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c60a3d7d9057e665023e464f62a3c2ea9ccd8b41..0db9da068391a381b0a594dc15ae2182dc0f12d9 100644
+index b2ad6265a9e2bb16592fb9719339be83d92ff82b..92590d92c6eb5e0d56d7c1791782c2a7d03edb66 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -281,6 +281,11 @@ public class PurpurWorldConfig {
+@@ -279,6 +279,11 @@ public class PurpurWorldConfig {
         villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
     }
 
--- a/patches/Purpur/patches/server/0057-Configurable-TPS-Catchup.patch
+++ b/patches/Purpur/patches/server/0057-Configurable-TPS-Catchup.patch
--- a/patches/Purpur/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/Purpur/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@ -18,7 +18,7 @@ index 8026a55d462a646d6b39db21d52ba0871dfbc4d3..2acbe7437df71fc27580deddee8eb765
 
             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 0db9da068391a381b0a594dc15ae2182dc0f12d9..fd111dae73f07a787edf38c2de41063c305d7a7d 100644
+index 92590d92c6eb5e0d56d7c1791782c2a7d03edb66..326be3a0ea64c328a6e8aafc752111f71e149381 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 {
--- a/patches/Purpur/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/Purpur/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
@ -47,7 +47,7 @@ index f53525eb32a6096ae24fd23756b2169d5d39e9d4..7b175240e44b0c7eb5044d7bcaf54dac
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fd111dae73f07a787edf38c2de41063c305d7a7d..d0bb71e450026f830e5f52dce7ecf1d4c1011fb8 100644
+index 326be3a0ea64c328a6e8aafc752111f71e149381..f56710d84ab8519519edbcf1040aea912f9f4f3c 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 {
@ -61,7 +61,7 @@ index fd111dae73f07a787edf38c2de41063c305d7a7d..d0bb71e450026f830e5f52dce7ecf1d4
         creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
     }
 
-@@ -203,6 +205,11 @@ public class PurpurWorldConfig {
+@@ -201,6 +203,11 @@ public class PurpurWorldConfig {
         enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
     }
 
--- a/patches/Purpur/patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
+++ b/patches/Purpur/patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
@ -18,7 +18,7 @@ index 7d9027d881e6e3eb0d1f8478ac7a1501dc5dec1d..72d07fd593dd9459b3ce1c238a02f383
             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 d0bb71e450026f830e5f52dce7ecf1d4c1011fb8..8677230d4bf721f7a24ffa56d6306a1adfb65e60 100644
+index f56710d84ab8519519edbcf1040aea912f9f4f3c..9878953c76a9bcd2a29774a37c1b65ec919b3963 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 {
--- a/patches/Purpur/patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
+++ b/patches/Purpur/patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
@ -18,10 +18,10 @@ index 54a555509e3d83e9749609dc35897ad151bca681..0ff202c0d77681f7e0d55d57c69dd0e4
         } 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 8677230d4bf721f7a24ffa56d6306a1adfb65e60..79109fd94ba90ae43ce39d858b5d06a5f769a333 100644
+index 9878953c76a9bcd2a29774a37c1b65ec919b3963..744e1406e7a47045eff7a20b03a8eaf7128d768e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -287,9 +287,11 @@ public class PurpurWorldConfig {
+@@ -285,9 +285,11 @@ public class PurpurWorldConfig {
 
     public int villagerBrainTicks = 1;
     public boolean villagerUseBrainTicksOnlyWhenLagging = true;
--- a/patches/Purpur/patches/server/0062-Villagers-follow-emerald-blocks.patch
+++ b/patches/Purpur/patches/server/0062-Villagers-follow-emerald-blocks.patch
@ -48,10 +48,10 @@ index f1a509063c09e603140c74255a3fb901693d2cc5..74c2d89af516ffc252032d5cbd12b489
         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 79109fd94ba90ae43ce39d858b5d06a5f769a333..7b3df3fa454164bd13bbadd80d2900edeb4fc974 100644
+index 744e1406e7a47045eff7a20b03a8eaf7128d768e..a7e9793d21b86c52fdfe5ef84a8edc8faaf55d48 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -288,10 +288,17 @@ public class PurpurWorldConfig {
+@@ -286,10 +286,17 @@ public class PurpurWorldConfig {
     public int villagerBrainTicks = 1;
     public boolean villagerUseBrainTicksOnlyWhenLagging = true;
     public boolean villagerFarmingBypassMobGriefing = false;
--- a/patches/Purpur/patches/server/0063-Allow-leashing-villagers.patch
+++ b/patches/Purpur/patches/server/0063-Allow-leashing-villagers.patch
@ -51,10 +51,10 @@ index 74c2d89af516ffc252032d5cbd12b489ea46813e..96dda6a14fd17509e9bcb72cc7e9c853
     @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 7b3df3fa454164bd13bbadd80d2900edeb4fc974..585e4aef1a85924655165670aa408ca368eef864 100644
+index a7e9793d21b86c52fdfe5ef84a8edc8faaf55d48..6954d4ac923cda1e0a0ead13c33dbc67ef6203b7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -287,17 +287,21 @@ public class PurpurWorldConfig {
+@@ -285,17 +285,21 @@ public class PurpurWorldConfig {
 
     public int villagerBrainTicks = 1;
     public boolean villagerUseBrainTicksOnlyWhenLagging = true;
--- a/patches/Purpur/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/Purpur/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch
@ -18,10 +18,10 @@ index e4aedb3df5d0a47b5bb9175627aa794fc1779639..c06425434c97645b914c07940528901a
 
         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 585e4aef1a85924655165670aa408ca368eef864..db6fb004be99341dba16c184244ed1a04c386fd4 100644
+index 6954d4ac923cda1e0a0ead13c33dbc67ef6203b7..93054e3bd9a9140dd86f2cfeb9d151251e816868 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -290,12 +290,16 @@ public class PurpurWorldConfig {
+@@ -288,12 +288,16 @@ public class PurpurWorldConfig {
     public boolean villagerCanBeLeashed = false;
     public boolean villagerFarmingBypassMobGriefing = false;
     public boolean villagerFollowEmeraldBlock = false;
--- a/patches/Purpur/patches/server/0065-Implement-infinite-lava.patch
+++ b/patches/Purpur/patches/server/0065-Implement-infinite-lava.patch
@ -59,7 +59,7 @@ index 29930e801cdcb97bec2fb113ec478fe9c4a63b63..ffab2391925f577420ee52f3aa05041a
     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 db6fb004be99341dba16c184244ed1a04c386fd4..d1f86ed2bbdec50e17b04814ea103bc0fb9ac0b1 100644
+index 93054e3bd9a9140dd86f2cfeb9d151251e816868..fc480a8df65768e980bd5ae5f2085d792e5f735b 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 {
--- a/patches/Purpur/patches/server/0066-Make-lava-flow-speed-configurable.patch
+++ b/patches/Purpur/patches/server/0066-Make-lava-flow-speed-configurable.patch
@ -18,7 +18,7 @@ index ffab2391925f577420ee52f3aa05041afa61464e..d981aa5a5f001333675eabd50497bbfa
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d1f86ed2bbdec50e17b04814ea103bc0fb9ac0b1..4fa008bdbd40effe092c7d36ac2157918fb6d3f6 100644
+index fc480a8df65768e980bd5ae5f2085d792e5f735b..0511516646c24eaa5dc2edbb24ef1b92a51dd906 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 {
--- a/patches/Purpur/patches/server/0067-Add-player-death-exp-control-options.patch
+++ b/patches/Purpur/patches/server/0067-Add-player-death-exp-control-options.patch
@ -40,7 +40,7 @@ index f15ec5c45d95c6828ed628451917ac3426a76f1f..0ef020972494181a87c86f95aec7a430
             return 0;
         }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4fa008bdbd40effe092c7d36ac2157918fb6d3f6..d54f699aba5c73704f2c739f8fb3f8becf8288ad 100644
+index 0511516646c24eaa5dc2edbb24ef1b92a51dd906..4d6618db81b0306d37b1de01564bd6e7eabd4291 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 {
--- a/patches/Purpur/patches/server/0068-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/Purpur/patches/server/0068-Add-canSaveToDisk-to-Entity.patch
--- a/patches/Purpur/patches/server/0069-Configurable-void-damage-height.patch
+++ b/patches/Purpur/patches/server/0069-Configurable-void-damage-height.patch
@ -18,7 +18,7 @@ index dfbb5a9538780cbd2a5766486138f35b189da235..9eb2e73c084b142bf04f798b572e6ca8
             && this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) {
             this.doVoidDamage();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d54f699aba5c73704f2c739f8fb3f8becf8288ad..046c6e688c64c6f2b2d11c8d356ce0b738e7fc6e 100644
+index 4d6618db81b0306d37b1de01564bd6e7eabd4291..e150753b7635476ca3c0c0d0806db8121f6e6cd3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,11 +116,13 @@ public class PurpurWorldConfig {
--- a/patches/Purpur/patches/server/0070-Dispenser-curse-of-binding-protection.patch
+++ b/patches/Purpur/patches/server/0070-Dispenser-curse-of-binding-protection.patch
@ -44,7 +44,7 @@ index 669a5041184846ca8430a7f0d3197025fe6d437e..7cd2e871b5a429a86dbc3c4208d247a4
         return this.b;
     }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 046c6e688c64c6f2b2d11c8d356ce0b738e7fc6e..9b927dad1b054a21498205bf13f3952ea7ada48a 100644
+index e150753b7635476ca3c0c0d0806db8121f6e6cd3..e10a34e1d81e814921b853b8b4252b13e0d05aab 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -162,6 +162,11 @@ public class PurpurWorldConfig {
--- a/patches/Purpur/patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/Purpur/patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch
@ -17,7 +17,7 @@ index baa4a61114e7460c74027e1519332f0dd9582647..603910a6f9ecc34be9eb2d4fb28e5c2e
             } else {
                 return EntityBoat.EnumStatus.IN_AIR;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9b927dad1b054a21498205bf13f3952ea7ada48a..97175fa5dc4d697118bb6391effef373bce110be 100644
+index e10a34e1d81e814921b853b8b4252b13e0d05aab..ed277e64f7228e1cd4a9697fd775715f761a3e13 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,12 +112,14 @@ public class PurpurWorldConfig {
--- a/patches/Purpur/patches/server/0072-Add-obfhelpers-for-plugin-use.patch
+++ b/patches/Purpur/patches/server/0072-Add-obfhelpers-for-plugin-use.patch
--- a/patches/Purpur/patches/server/0073-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/Purpur/patches/server/0073-Mending-mends-most-damages-equipment-first.patch
@ -78,7 +78,7 @@ index 7f3df9ba37076c0a982803148d21b0985f62f12c..e747ee83f1a69a4a4bad87e720abc9b0
         return this.tag == null ? 0 : this.tag.getInt("Damage");
     }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 97175fa5dc4d697118bb6391effef373bce110be..d61a96f0d9fc92780da0c698ffb4b903878a4198 100644
+index ed277e64f7228e1cd4a9697fd775715f761a3e13..f5980d21cc10b3a43ae3ed2be961449810790e75 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,7 @@ public class PurpurWorldConfig {
--- a/patches/Purpur/patches/server/0074-Add-5-second-tps-average-in-tps.patch
+++ b/patches/Purpur/patches/server/0074-Add-5-second-tps-average-in-tps.patch
--- a/patches/Purpur/patches/server/0075-Implement-elytra-settings.patch
+++ b/patches/Purpur/patches/server/0075-Implement-elytra-settings.patch
@ -93,7 +93,7 @@ index 3663b701736b583db80e3119b642e47b8a0e6ff3..18f767dc574e7345d2db73e6be44f4e6
                         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 d61a96f0d9fc92780da0c698ffb4b903878a4198..886c3b98d6bff04a93cd963a092654ef1c9729d1 100644
+index f5980d21cc10b3a43ae3ed2be961449810790e75..c5193b394319fa68bedc6aa07b57fea24ac49d80 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -129,6 +129,19 @@ public class PurpurWorldConfig {
--- a/patches/Purpur/patches/server/0076-Item-entity-immunities.patch
+++ b/patches/Purpur/patches/server/0076-Item-entity-immunities.patch
@ -94,10 +94,10 @@ index 228236bce14bfdf930570b453862dcfaae9e4823..ad06bd81eded5d60f16c2d0ad1a4390f
             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 886c3b98d6bff04a93cd963a092654ef1c9729d1..75250392135f416e766e44ffdad7eecd06a89ae5 100644
+index c5193b394319fa68bedc6aa07b57fea24ac49d80..9940bf351c05606137837ab2400ffe1a02b9bec2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -101,6 +101,27 @@ public class PurpurWorldConfig {
+@@ -101,6 +101,39 @@ public class PurpurWorldConfig {
         }
     }
 
@ -107,16 +107,28 @@ index 886c3b98d6bff04a93cd963a092654ef1c9729d1..75250392135f416e766e44ffdad7eecd
 +    private void itemSettings() {
 +        itemImmuneToCactus.clear();
 +        getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
+            if (key.toString().equals("*")) {
+                IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToCactus.add(item));
+                return;
+            }
 +            Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
 +            if (item != Items.AIR) itemImmuneToCactus.add(item);
 +        });
 +        itemImmuneToExplosion.clear();
 +        getList("gameplay-mechanics.item.immune.explosion", new ArrayList<>()).forEach(key -> {
+            if (key.toString().equals("*")) {
+                IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToExplosion.add(item));
+                return;
+            }
 +            Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
 +            if (item != Items.AIR) itemImmuneToExplosion.add(item);
 +        });
 +        itemImmuneToFire.clear();
 +        getList("gameplay-mechanics.item.immune.fire", new ArrayList<>()).forEach(key -> {
+            if (key.toString().equals("*")) {
+                IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToFire.add(item));
+                return;
+            }
 +            Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
 +            if (item != Items.AIR) itemImmuneToFire.add(item);
 +        });
--- a/patches/Purpur/patches/server/0077-Add-ping-command.patch
+++ b/patches/Purpur/patches/server/0077-Add-ping-command.patch
--- a/patches/Purpur/patches/server/0078-Configurable-jockey-options.patch
+++ b/patches/Purpur/patches/server/0078-Configurable-jockey-options.patch
@ -193,10 +193,10 @@ index e021c43b43839c00f81a01bfbec59c546d61ba50..505c83f3e3ad61c2d4d40c4df017e1f7
     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 75250392135f416e766e44ffdad7eecd06a89ae5..54afa5afa20f317d55b36df0aa325e0ac3e814a7 100644
+index 9940bf351c05606137837ab2400ffe1a02b9bec2..81a96503a6243800f4c37dc32f9550e3ee817fbb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -263,6 +263,15 @@ public class PurpurWorldConfig {
+@@ -275,6 +275,15 @@ public class PurpurWorldConfig {
         creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
     }
 
@ -209,10 +209,10 @@ index 75250392135f416e766e44ffdad7eecd06a89ae5..54afa5afa20f317d55b36df0aa325e0a
 +        drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
 +    }
 +
-     public boolean enderDragonAlwaysDropsEggBlock = false;
     public boolean enderDragonAlwaysDropsFullExp = false;
     private void enderDragonSettings() {
-@@ -302,6 +311,15 @@ public class PurpurWorldConfig {
+         enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
+@@ -312,6 +321,15 @@ public class PurpurWorldConfig {
         giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
     }
 
@ -228,7 +228,7 @@ index 75250392135f416e766e44ffdad7eecd06a89ae5..54afa5afa20f317d55b36df0aa325e0a
     public double illusionerMovementSpeed = 0.5D;
     public double illusionerFollowRange = 18.0D;
     public double illusionerMaxHealth = 32.0D;
-@@ -377,8 +395,35 @@ public class PurpurWorldConfig {
+@@ -387,8 +405,35 @@ public class PurpurWorldConfig {
         witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
     }
 
--- a/patches/Purpur/patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/Purpur/patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@ -321,10 +321,10 @@ index 3a70900c73e3a6c4f40cf74406534f4bfd3eb67b..dfce36368da9bdd9285c490a802f7a0c
 
             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 54afa5afa20f317d55b36df0aa325e0ac3e814a7..4d12719b4b695328e364d4c39f5d54cd00522f09 100644
+index 81a96503a6243800f4c37dc32f9550e3ee817fbb..39f6b309342b91ab3bd4eed4afbeb8ccb1387e64 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -339,6 +339,15 @@ public class PurpurWorldConfig {
+@@ -349,6 +349,15 @@ public class PurpurWorldConfig {
         ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
     }
 
--- a/patches/Purpur/patches/server/0080-Add-phantom-spawning-options.patch
+++ b/patches/Purpur/patches/server/0080-Add-phantom-spawning-options.patch
@ -245,10 +245,10 @@ index fb650c09dbcefa0ff021f7c508ff6811a48bee7a..68cce071c740c90149225b4a28af8492
     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 4d12719b4b695328e364d4c39f5d54cd00522f09..7b3714ff8b7e6dafe1475c9fc176a69d60e8eef7 100644
+index 39f6b309342b91ab3bd4eed4afbeb8ccb1387e64..966784d5398929497f4a426280bba47bb7caf9a7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -342,10 +342,34 @@ public class PurpurWorldConfig {
+@@ -352,10 +352,34 @@ public class PurpurWorldConfig {
     public double phantomAttackedByCrystalRadius = 0.0D;
     public float phantomAttackedByCrystalDamage = 1.0F;
     public double phantomOrbitCrystalRadius = 0.0D;
--- a/patches/Purpur/patches/server/0081-Implement-bed-explosion-options.patch
+++ b/patches/Purpur/patches/server/0081-Implement-bed-explosion-options.patch
@ -18,7 +18,7 @@ index 24a5c64b65f0098b1395d352cc2f99bbbbaf9c94..738535d01adf8bfd895b5057e5950422
             }
         }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7b3714ff8b7e6dafe1475c9fc176a69d60e8eef7..240f1592b04848fc0c45c5ffe4c59145e043c16a 100644
+index 966784d5398929497f4a426280bba47bb7caf9a7..ea20ca8dc50ff1216ce8ca351ef991d5808bd88c 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 7b3714ff8b7e6dafe1475c9fc176a69d60e8eef7..240f1592b04848fc0c45c5ffe4c59145
 
 import static net.pl3x.purpur.PurpurConfig.log;
 
-@@ -200,6 +202,22 @@ public class PurpurWorldConfig {
+@@ -212,6 +214,22 @@ public class PurpurWorldConfig {
         });
     }
 
--- a/patches/Purpur/patches/server/0082-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/Purpur/patches/server/0082-Implement-respawn-anchor-explosion-options.patch
@ -30,10 +30,10 @@ index 21c5ad83a95bcd23071423c0e8336656b760fcde..521d161a3d015b641b61de21401c79ac
 
     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 240f1592b04848fc0c45c5ffe4c59145e043c16a..3d6f4de01409c70c5f4d2fcd7a52d158aa0fdf80 100644
+index ea20ca8dc50ff1216ce8ca351ef991d5808bd88c..8aaa718a0df3f71f9a06bf8eb3547453b26551da 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -239,6 +239,22 @@ public class PurpurWorldConfig {
+@@ -251,6 +251,22 @@ public class PurpurWorldConfig {
         lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
     }
 
--- a/patches/Purpur/patches/server/0083-Add-allow-water-in-end-world-option.patch
+++ b/patches/Purpur/patches/server/0083-Add-allow-water-in-end-world-option.patch
--- a/patches/Purpur/patches/server/0084-Allow-color-codes-in-books.patch
+++ b/patches/Purpur/patches/server/0084-Allow-color-codes-in-books.patch
--- a/patches/Purpur/patches/server/0085-Entity-lifespan.patch
+++ b/patches/Purpur/patches/server/0085-Entity-lifespan.patch
@ -104,7 +104,7 @@ index ffccdc3bf1d28836f4fc2772ebfde843415ea232..8932f4854d9fc52fb2ec66a748e640df
                         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 3d6f4de01409c70c5f4d2fcd7a52d158aa0fdf80..d7635a3b2abb15407f55119bc29a5ee583ea714a 100644
+index 8aaa718a0df3f71f9a06bf8eb3547453b26551da..5a04f0e506293f76bc43540142ca3b26cf97c760 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 {
--- a/patches/Purpur/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/Purpur/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@ -17,10 +17,10 @@ index 82ef4c9c534f4a0840a61d33c7727bd4770c7511..bfbe9b82c14a525bffa96a8dfa071e88
                     }
                 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5c81b2ad016325b1b04b7da489c413ee2e5128d2..b68f342b89935f4b023823b7ff92d6268aafaa0e 100644
+index 074389c45965df5ab0803103e1dfc39f6fdc8cb0..8fb6b05ca4497e25272d726297536683a38f67f6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -2389,4 +2389,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2394,4 +2394,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         return (CraftPlayer) super.getBukkitEntity();
     }
     // CraftBukkit end
@ -48,10 +48,10 @@ index 5c81b2ad016325b1b04b7da489c413ee2e5128d2..b68f342b89935f4b023823b7ff92d626
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d7635a3b2abb15407f55119bc29a5ee583ea714a..876aaf4fcfef01427a898dcf8c8db334334814b0 100644
+index 5a04f0e506293f76bc43540142ca3b26cf97c760..0b2a9a2d9f157dd9879c4429be6745859b4f28bf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -184,6 +184,11 @@ public class PurpurWorldConfig {
+@@ -196,6 +196,11 @@ public class PurpurWorldConfig {
         playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
     }
 
--- a/patches/Purpur/patches/server/0087-Squid-EAR-immunity.patch
+++ b/patches/Purpur/patches/server/0087-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 876aaf4fcfef01427a898dcf8c8db334334814b0..5c22c9166c6f6d65e89325653b7ee959ebff6939 100644
+index 0b2a9a2d9f157dd9879c4429be6745859b4f28bf..01576ac82836733f42168c6a0779b45ae63aeebb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -443,6 +443,11 @@ public class PurpurWorldConfig {
+@@ -453,6 +453,11 @@ public class PurpurWorldConfig {
         snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
     }
 
--- a/patches/Purpur/patches/server/0088-Configurable-end-spike-seed.patch
+++ b/patches/Purpur/patches/server/0088-Configurable-end-spike-seed.patch
--- a/patches/Purpur/patches/server/0089-Configurable-dungeon-seed.patch
+++ b/patches/Purpur/patches/server/0089-Configurable-dungeon-seed.patch
--- a/patches/Purpur/patches/server/0090-Phantoms-burn-in-light.patch
+++ b/patches/Purpur/patches/server/0090-Phantoms-burn-in-light.patch
@ -70,10 +70,10 @@ index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c8037
     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 5c22c9166c6f6d65e89325653b7ee959ebff6939..42399ce5b19f4e96087bde3c6902a5c8e78d6c50 100644
+index 01576ac82836733f42168c6a0779b45ae63aeebb..a4e5462d4731aaa4b0c436cf001d9c2be1cc961c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -398,6 +398,9 @@ public class PurpurWorldConfig {
+@@ -408,6 +408,9 @@ public class PurpurWorldConfig {
     public int phantomSpawnOverheadRadius = 10;
     public int phantomSpawnMinPerAttempt = 1;
     public int phantomSpawnMaxPerAttempt = -1;
@ -83,7 +83,7 @@ index 5c22c9166c6f6d65e89325653b7ee959ebff6939..42399ce5b19f4e96087bde3c6902a5c8
     private void phantomSettings() {
         phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
         phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
-@@ -414,6 +417,9 @@ public class PurpurWorldConfig {
+@@ -424,6 +427,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);
--- a/patches/Purpur/patches/server/0091-Configurable-villager-breeding.patch
+++ b/patches/Purpur/patches/server/0091-Configurable-villager-breeding.patch
@ -18,10 +18,10 @@ index c06425434c97645b914c07940528901a2979ce1b..a0bfef54c853d57c9a5c6d3f9f195916
 
     private boolean fr() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 42399ce5b19f4e96087bde3c6902a5c8e78d6c50..8c730d1ec0eebde4210f5c8eab55eb1b71f9584d 100644
+index a4e5462d4731aaa4b0c436cf001d9c2be1cc961c..76ed53f930f6d2e01a854d0e28db4bcf11a06627 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -461,6 +461,7 @@ public class PurpurWorldConfig {
+@@ -471,6 +471,7 @@ public class PurpurWorldConfig {
     public boolean villagerFollowEmeraldBlock = false;
     public int villagerSpawnIronGolemRadius = 0;
     public int villagerSpawnIronGolemLimit = 0;
@ -29,7 +29,7 @@ index 42399ce5b19f4e96087bde3c6902a5c8e78d6c50..8c730d1ec0eebde4210f5c8eab55eb1b
     private void villagerSettings() {
         villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
         villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
-@@ -469,6 +470,7 @@ public class PurpurWorldConfig {
+@@ -479,6 +480,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);
--- a/patches/Purpur/patches/server/0092-Redstone-deactivates-spawners.patch
+++ b/patches/Purpur/patches/server/0092-Redstone-deactivates-spawners.patch
@ -26,10 +26,10 @@ index c2e830db7aa2944a477624e149a3ba66d112b68a..3b4cc9871c123cfd134783745145c407
     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 8c730d1ec0eebde4210f5c8eab55eb1b71f9584d..03de0b6385193b3ba571fd0f8f0bb316a7f158d0 100644
+index 76ed53f930f6d2e01a854d0e28db4bcf11a06627..1f83fae3935d8bdacd396697e36d3c80d4d93b42 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -272,6 +272,11 @@ public class PurpurWorldConfig {
+@@ -284,6 +284,11 @@ public class PurpurWorldConfig {
         signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
     }
 
--- a/patches/Purpur/patches/server/0093-Totems-work-in-inventory.patch
+++ b/patches/Purpur/patches/server/0093-Totems-work-in-inventory.patch
@ -29,10 +29,10 @@ index bfbe9b82c14a525bffa96a8dfa071e8805ce6006..c22fa35197ae23526a29bcbf69f3022f
             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 03de0b6385193b3ba571fd0f8f0bb316a7f158d0..97bace9aac1d907730e991beb3fcd9aa7bbe480c 100644
+index 1f83fae3935d8bdacd396697e36d3c80d4d93b42..9c32d1d0d283ce8fb290623c8e40c2606d2fdd82 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -189,6 +189,11 @@ public class PurpurWorldConfig {
+@@ -201,6 +201,11 @@ public class PurpurWorldConfig {
         teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
     }
 
--- a/patches/Purpur/patches/server/0094-Fix-death-message-colors.patch
+++ b/patches/Purpur/patches/server/0094-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 b68f342b89935f4b023823b7ff92d6268aafaa0e..aba0647c9b297d532a5e7100eb95337e6a0db776 100644
+index 8fb6b05ca4497e25272d726297536683a38f67f6..62cb2cfcdd245a1ecfeaf1f418ad4f8a3e692a37 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -852,7 +852,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/patches/Purpur/patches/server/0095-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
+++ b/patches/Purpur/patches/server/0095-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
--- a/patches/Purpur/patches/server/0096-Populator-seed-controls.patch
+++ b/patches/Purpur/patches/server/0096-Populator-seed-controls.patch
--- a/patches/Purpur/patches/server/0097-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/Purpur/patches/server/0097-Add-vindicator-johnny-spawn-chance.patch
@ -22,7 +22,7 @@ index 4761ddfedeed54e79788a6f60f06a805efd60ab1..23b350f793539672b6990327ed52e9bb
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 97bace9aac1d907730e991beb3fcd9aa7bbe480c..a2aa975ce17ceebee97afb9594ac9f403f162fce 100644
+index 9c32d1d0d283ce8fb290623c8e40c2606d2fdd82..a38cea444879becaa043f131b754f7d812375e6c 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/Purpur/patches/server/0098-DragonEggPlaceEvent.patch
+++ b/patches/Purpur/patches/server/0098-DragonEggPlaceEvent.patch
@ -5,13 +5,13 @@ Subject: [PATCH] DragonEggPlaceEvent


 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index f853f6c424da77c40ee3d5b5dc2279ba8918977c..5199cba870a6ea004ee72ce225a0b6f483aed2ed 100644
+index 7f11adbc5d8527b50f7657d46459516a471017b3..9cf7151d8623624c636c948a8716db31f275bfe3 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 {
             this.generateExitPortal(true);
             this.n();
-             if (this.world.purpurConfig.enderDragonAlwaysDropsEggBlock || !this.previouslyKilled) { // Purpur - always place dragon egg
+             if (this.world.paperConfig.enderDragonsDeathAlwaysPlacesDragonEgg || !this.previouslyKilled) { // Paper - always place dragon egg
 -                this.world.setTypeUpdate(this.world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a), Blocks.DRAGON_EGG.getBlockData());
 +                // Purpur start
 +                BlockPosition pos = this.world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a);
--- a/patches/Purpur/patches/server/0099-Add-option-to-disable-mushroom-block-updates.patch
+++ b/patches/Purpur/patches/server/0099-Add-option-to-disable-mushroom-block-updates.patch
--- a/patches/Purpur/patches/server/0100-Dispensers-place-anvils-option.patch
+++ b/patches/Purpur/patches/server/0100-Dispensers-place-anvils-option.patch
@ -61,10 +61,10 @@ index 7b8a470d97ccf0fdcdb8eef9368195486e09913b..d1f9d2884d055efbe72b01f86b0bdaf1
 
     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 a2aa975ce17ceebee97afb9594ac9f403f162fce..2d426d35a328ad3d5ce11615dc300bfacfef6df4 100644
+index a38cea444879becaa043f131b754f7d812375e6c..059c66a2d3f878cde8896c8f10f71bfecaea4685 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -239,8 +239,10 @@ public class PurpurWorldConfig {
+@@ -251,8 +251,10 @@ public class PurpurWorldConfig {
     }
 
     public boolean dispenserApplyCursedArmor = true;
--- a/patches/Purpur/patches/server/0101-Allow-anvil-colors.patch
+++ b/patches/Purpur/patches/server/0101-Allow-anvil-colors.patch
@ -35,10 +35,10 @@ index 4aa6b035a6a8ea39401c6566cd286de39f60e942..5e4e59e5c8478b76078fdda14e5ced76
             }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2d426d35a328ad3d5ce11615dc300bfacfef6df4..a1da26acfc1aa6f367206223222bdeb877241ba3 100644
+index 059c66a2d3f878cde8896c8f10f71bfecaea4685..95d13aafc468532f66abd265657f463e361f2297 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -222,6 +222,11 @@ public class PurpurWorldConfig {
+@@ -234,6 +234,11 @@ public class PurpurWorldConfig {
         });
     }
 
--- a/patches/Purpur/patches/server/0102-Add-no-tick-block-list.patch
+++ b/patches/Purpur/patches/server/0102-Add-no-tick-block-list.patch
@ -43,7 +43,7 @@ index 2f41a537fb1d8348b5f65a3e85da841761311744..d5007d00da9a10e99d7fa46a4368d41f
             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 a1da26acfc1aa6f367206223222bdeb877241ba3..8c1842e38a617416040ad1c6776a84252004ff90 100644
+index 95d13aafc468532f66abd265657f463e361f2297..84db039126ab866aa2be4b7b1c0efa7e17573a54 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;
@ -57,7 +57,7 @@ index a1da26acfc1aa6f367206223222bdeb877241ba3..8c1842e38a617416040ad1c6776a8425
 import java.util.logging.Level;
 
 import static net.pl3x.purpur.PurpurConfig.log;
-@@ -189,6 +191,16 @@ public class PurpurWorldConfig {
+@@ -201,6 +203,16 @@ public class PurpurWorldConfig {
         playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
     }
 
--- a/patches/Purpur/patches/server/0103-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/Purpur/patches/server/0103-Add-option-to-disable-dolphin-treasure-searching.patch
@ -17,10 +17,10 @@ index 2916ee89ef7a14619703dfbe7efd5c78a2f34337..664f9693368852bfb06a7a3bd0862a10
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8c1842e38a617416040ad1c6776a84252004ff90..5fe074cab7afdcb1a30801f2f59b5a3080d93759 100644
+index 84db039126ab866aa2be4b7b1c0efa7e17573a54..33aae151c8d79bac8fb52f2c3f526d0017306098 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -341,6 +341,11 @@ public class PurpurWorldConfig {
+@@ -353,6 +353,11 @@ public class PurpurWorldConfig {
         creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
     }
 
--- a/patches/Purpur/patches/server/0104-Short-enderman-height.patch
+++ b/patches/Purpur/patches/server/0104-Short-enderman-height.patch
--- a/patches/Purpur/patches/server/0105-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/Purpur/patches/server/0105-Stop-squids-floating-on-top-of-water.patch
@ -43,10 +43,10 @@ index b21605a62365fe24f315f35bd840b4740fc80f0e..148e4b158734f136832e5c17bdc69634
     protected void initPathfinder() {
         this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5fe074cab7afdcb1a30801f2f59b5a3080d93759..2a997302e1df398f9ca546a1acfa3a9cf70c7d54 100644
+index 33aae151c8d79bac8fb52f2c3f526d0017306098..94f11a3dc2a4e595e3fe9dffee3d31de0040292f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -489,8 +489,10 @@ public class PurpurWorldConfig {
+@@ -499,8 +499,10 @@ public class PurpurWorldConfig {
     }
 
     public boolean squidImmuneToEAR = true;
--- a/patches/Purpur/patches/server/0106-Ridables.patch
+++ b/patches/Purpur/patches/server/0106-Ridables.patch
@ -3211,7 +3211,7 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6
         this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
         this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index aba0647c9b297d532a5e7100eb95337e6a0db776..9e3c85d3dd70bccdbff9663e86dd0bb449701085 100644
+index 62cb2cfcdd245a1ecfeaf1f418ad4f8a3e692a37..6047e34c3aab912d5e4987be7eaf5184fb03d06e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -4486,17 +4486,17 @@ index ca3c5150bcfe2a92b49ad5a27c23dd37a7054fbb..323d79a99402b0f6952b4fb873170069
         this.targetSelector.a(2, this.br);
         this.targetSelector.a(3, this.bs);
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 2e623ef9be036ea467e9e41817c2eced018f8f93..0abfa34a8fa0088c2089645f54f85d4490a04bc9 100644
+index 2e623ef9be036ea467e9e41817c2eced018f8f93..59382230aec623f7de889c30a0ed6a2a3fa35a05 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
-@@ -26,6 +26,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
-     private final float[] bt = new float[2];
-     private final int[] bu = new int[2];
-     private final int[] bv = new int[2];
+@@ -32,6 +32,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+         return entityliving.getMonsterType() != EnumMonsterType.UNDEAD && entityliving.ei();
+     };
+     private static final PathfinderTargetCondition bz = (new PathfinderTargetCondition()).a(20.0D).a(EntityWither.by);
 +    private int shootCooldown = 0; // Purpur
-     private int bw;
-     public final BossBattleServer bossBattle;
-     private static final Predicate<EntityLiving> by = (entityliving) -> {
+     // Paper start
+     private boolean canPortal = false;
+ 
@@ -44,15 +45,122 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
         this.setHealth(this.getMaxHealth());
         this.getNavigation().d(true);
@ -5071,7 +5071,7 @@ index c314a8c9a921a95cea43b748e2037521d948e1e7..59f3122aab9940cb3c3c1efb2664ab08
 
     public static int dungeonSeed = -1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04d87a70e2 100644
+index 94f11a3dc2a4e595e3fe9dffee3d31de0040292f..a70f8d6bd20bebb128ef0c232384f7d43e9b6e80 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -42,11 +42,6 @@ public class PurpurWorldConfig {
@ -5086,7 +5086,7 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
     private ConfigurationSection getConfigurationSection(String path) {
         ConfigurationSection section = PurpurConfig.config.getConfigurationSection("world-settings." + worldName + "." + path);
         return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path);
-@@ -315,63 +310,188 @@ public class PurpurWorldConfig {
+@@ -327,61 +322,186 @@ public class PurpurWorldConfig {
         turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
     }
 
@ -5219,13 +5219,11 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
 +    public boolean enderDragonRidable = false;
 +    public boolean enderDragonRidableInWater = false;
 +    public double enderDragonMaxY = 256D;
-     public boolean enderDragonAlwaysDropsEggBlock = false;
     public boolean enderDragonAlwaysDropsFullExp = false;
     private void enderDragonSettings() {
 +        enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
 +        enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
 +        enderDragonMaxY = getDouble("mobs.ender_dragon.ridable-max-y", enderDragonMaxY);
-         enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender_dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
         enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
     }
 
@ -5275,7 +5273,7 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
     public float giantStepHeight = 2.0F;
     public float giantJumpHeight = 1.0F;
     public double giantMovementSpeed = 0.5D;
-@@ -380,6 +500,8 @@ public class PurpurWorldConfig {
+@@ -390,6 +510,8 @@ public class PurpurWorldConfig {
     public boolean giantHaveHostileAI = false;
     public double giantMaxHealth = 100.0D;
     private void giantSettings() {
@ -5284,7 +5282,7 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
         giantStepHeight = (float) getDouble("mobs.giant.step-height", giantStepHeight);
         giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
         giantMovementSpeed = getDouble("mobs.giant.movement-speed", giantMovementSpeed);
-@@ -394,19 +516,44 @@ public class PurpurWorldConfig {
+@@ -404,19 +526,44 @@ public class PurpurWorldConfig {
         giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
     }
 
@ -5329,7 +5327,7 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
         illusionerMovementSpeed = getDouble("mobs.illusioner.movement-speed", illusionerMovementSpeed);
         illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
         if (PurpurConfig.version < 8) {
-@@ -417,11 +564,76 @@ public class PurpurWorldConfig {
+@@ -427,11 +574,76 @@ public class PurpurWorldConfig {
         illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max-health", illusionerMaxHealth);
     }
 
@ -5406,7 +5404,7 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
     public double phantomAttackedByCrystalRadius = 0.0D;
     public float phantomAttackedByCrystalDamage = 1.0F;
     public double phantomOrbitCrystalRadius = 0.0D;
-@@ -441,6 +653,11 @@ public class PurpurWorldConfig {
+@@ -451,6 +663,11 @@ public class PurpurWorldConfig {
     public boolean phantomIgnorePlayersWithTorch = false;
     public boolean phantomBurnInDaylight = true;
     private void phantomSettings() {
@ -5418,7 +5416,7 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
         phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
         phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
         phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
-@@ -461,40 +678,184 @@ public class PurpurWorldConfig {
+@@ -471,40 +688,184 @@ public class PurpurWorldConfig {
         phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
     }
 
@ -5603,7 +5601,7 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
     public int villagerBrainTicks = 1;
     public boolean villagerUseBrainTicksOnlyWhenLagging = true;
     public boolean villagerCanBeLeashed = false;
-@@ -504,6 +865,8 @@ public class PurpurWorldConfig {
+@@ -514,6 +875,8 @@ public class PurpurWorldConfig {
     public int villagerSpawnIronGolemLimit = 0;
     public boolean villagerCanBreed = true;
     private void villagerSettings() {
@ -5612,7 +5610,7 @@ index 2a997302e1df398f9ca546a1acfa3a9cf70c7d54..2644fbcaa8be55b0c09b79baa0727d04
         villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
         villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
         villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
-@@ -514,45 +877,108 @@ public class PurpurWorldConfig {
+@@ -524,45 +887,108 @@ public class PurpurWorldConfig {
         villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
     }
 
--- a/patches/Purpur/patches/server/0107-Use-configured-height-for-nether-surface-builders.patch
+++ b/patches/Purpur/patches/server/0107-Use-configured-height-for-nether-surface-builders.patch
--- a/patches/Purpur/patches/server/0108-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/Purpur/patches/server/0108-Crying-obsidian-valid-for-portal-frames.patch
--- a/patches/Purpur/patches/server/0109-Entities-can-use-portals-configuration.patch
+++ b/patches/Purpur/patches/server/0109-Entities-can-use-portals-configuration.patch
@ -27,10 +27,10 @@ index 0115e2c73eff9d5e4c6778e32fc54b9c116b6b22..e4f2e51b6306fcaf161b7dfb734d9d28
 
     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 2644fbcaa8be55b0c09b79baa0727d04d87a70e2..012246fa0dc596ce13819a33438940c52672e97a 100644
+index a70f8d6bd20bebb128ef0c232384f7d43e9b6e80..3ce06799d0c5798f094171b3c559b7eec65b66a3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -146,6 +146,7 @@ public class PurpurWorldConfig {
+@@ -158,6 +158,7 @@ public class PurpurWorldConfig {
     public boolean boatEjectPlayersOnLand = false;
     public boolean disableDropsOnCrammingDeath = false;
     public boolean entitiesPickUpLootBypassMobGriefing = false;
@ -38,7 +38,7 @@ index 2644fbcaa8be55b0c09b79baa0727d04d87a70e2..012246fa0dc596ce13819a33438940c5
     public boolean milkCuresBadOmen = true;
     public double tridentLoyaltyVoidReturnHeight = 0.0D;
     public double voidDamageHeight = -64.0D;
-@@ -154,6 +155,7 @@ public class PurpurWorldConfig {
+@@ -166,6 +167,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);
--- a/patches/Purpur/patches/server/0110-LivingEntity-broadcastItemBreak.patch
+++ b/patches/Purpur/patches/server/0110-LivingEntity-broadcastItemBreak.patch
--- a/patches/Purpur/patches/server/0111-Customizable-wither-health-and-healing.patch
+++ b/patches/Purpur/patches/server/0111-Customizable-wither-health-and-healing.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Customizable wither health and healing
 Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.

 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 0abfa34a8fa0088c2089645f54f85d4490a04bc9..510797225d50de1565288c8df484384874050172 100644
+index 59382230aec623f7de889c30a0ed6a2a3fa35a05..121eefd5d89f88c762b19088c657a41f9850b619 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -150,6 +150,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@ -44,10 +44,10 @@ index 0abfa34a8fa0088c2089645f54f85d4490a04bc9..510797225d50de1565288c8df4843848
 
             //this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 012246fa0dc596ce13819a33438940c52672e97a..8d7afc65bf8b399fa49944fb11d14168a351bb2e 100644
+index 3ce06799d0c5798f094171b3c559b7eec65b66a3..789d471ae244f635fc393d0bf581189587a7ee57 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -909,10 +909,21 @@ public class PurpurWorldConfig {
+@@ -919,10 +919,21 @@ public class PurpurWorldConfig {
     public boolean witherRidable = false;
     public boolean witherRidableInWater = false;
     public double witherMaxY = 256D;
--- a/patches/Purpur/patches/server/0112-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/Purpur/patches/server/0112-Allow-toggling-special-MobSpawners-per-world.patch
@ -72,7 +72,7 @@ index 79ae47ffafae09059774e45b48a36818e104b036..7ee7975d5569d24c836018e240ebd785
         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 8d7afc65bf8b399fa49944fb11d14168a351bb2e..853f55b91609df363d92cf403eb76e2353d377b1 100644
+index 789d471ae244f635fc393d0bf581189587a7ee57..c38f262a8151397be319f083ee6c201ccaf1a9ec 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;
@ -118,7 +118,7 @@ index 8d7afc65bf8b399fa49944fb11d14168a351bb2e..853f55b91609df363d92cf403eb76e23
     private double getDouble(String path, double def) {
         PurpurConfig.config.addDefault("world-settings.default." + path, def);
         return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
-@@ -161,6 +172,21 @@ public class PurpurWorldConfig {
+@@ -173,6 +184,21 @@ public class PurpurWorldConfig {
         voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
     }
 
--- a/patches/Purpur/patches/server/0113-Raid-cooldown-setting.patch
+++ b/patches/Purpur/patches/server/0113-Raid-cooldown-setting.patch
@ -52,10 +52,10 @@ index 826dcf9f7eedc3664d66170b97b2a19552a0dc60..807910c60e6cad58b91474b0477e6fc1
                     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 853f55b91609df363d92cf403eb76e2353d377b1..649b1efbb8f637e91f554e6bbb92fd06c26683ae 100644
+index c38f262a8151397be319f083ee6c201ccaf1a9ec..d7a4bf3ecb012adddbb9be2b42e9815c739659c7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -161,6 +161,7 @@ public class PurpurWorldConfig {
+@@ -173,6 +173,7 @@ public class PurpurWorldConfig {
     public boolean milkCuresBadOmen = true;
     public double tridentLoyaltyVoidReturnHeight = 0.0D;
     public double voidDamageHeight = -64.0D;
@ -63,7 +63,7 @@ index 853f55b91609df363d92cf403eb76e2353d377b1..649b1efbb8f637e91f554e6bbb92fd06
     private void miscGameplayMechanicsSettings() {
         useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-@@ -170,6 +171,7 @@ public class PurpurWorldConfig {
+@@ -182,6 +183,7 @@ public class PurpurWorldConfig {
         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);
--- a/patches/Purpur/patches/server/0114-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/Purpur/patches/server/0114-Despawn-rate-config-options-per-projectile-type.patch
@ -300,10 +300,10 @@ index b7e540dfeeabb13227596ecfc6eddabf3cfde537..56adefabdfbf444e87129715f107c6d3
 
     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 649b1efbb8f637e91f554e6bbb92fd06c26683ae..4e75bad4bb9cce557868152b9f2bc3e8cda4d826 100644
+index d7a4bf3ecb012adddbb9be2b42e9815c739659c7..fe0e89ec0daf03805a2d4c6a6a8096ce39556dd0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -153,6 +153,35 @@ public class PurpurWorldConfig {
+@@ -165,6 +165,35 @@ public class PurpurWorldConfig {
         idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
     }
 
--- a/patches/Purpur/patches/server/0115-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
+++ b/patches/Purpur/patches/server/0115-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
--- a/patches/Purpur/patches/server/0116-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/Purpur/patches/server/0116-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@ -69,10 +69,10 @@ index d835ce3fe7c71333efeed5b9cf2a827bebae97f2..556f7a3ebb5c58a87471b2d098f29ffb
         this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
     }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4e75bad4bb9cce557868152b9f2bc3e8cda4d826..d98ddaf02456ff5204a498bb6827bfad08cbc8d6 100644
+index fe0e89ec0daf03805a2d4c6a6a8096ce39556dd0..3d4e99bdab36ae51eb001ba40c30e56478b9eefd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1011,12 +1011,14 @@ public class PurpurWorldConfig {
+@@ -1021,12 +1021,14 @@ public class PurpurWorldConfig {
     public boolean zombieJockeyOnlyBaby = true;
     public double zombieJockeyChance = 0.05D;
     public boolean zombieJockeyTryExistingChickens = true;
--- a/patches/Purpur/patches/server/0117-Persistent-TileEntity-Lore-and-DisplayName.patch
+++ b/patches/Purpur/patches/server/0117-Persistent-TileEntity-Lore-and-DisplayName.patch
@ -165,10 +165,10 @@ index 58d958a88ac5af5b889d719d9f1ea90ce45cf184..8e8749095427b44e04582593114cae8c
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d98ddaf02456ff5204a498bb6827bfad08cbc8d6..72a16f70bd5be8232b2bc6caf489c64e34a6694c 100644
+index 3d4e99bdab36ae51eb001ba40c30e56478b9eefd..643dfd2f50939708fa6f3127ca371674f69f6527 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -188,6 +188,7 @@ public class PurpurWorldConfig {
+@@ -200,6 +200,7 @@ public class PurpurWorldConfig {
     public boolean entitiesPickUpLootBypassMobGriefing = false;
     public boolean entitiesCanUsePortals = true;
     public boolean milkCuresBadOmen = true;
@ -176,7 +176,7 @@ index d98ddaf02456ff5204a498bb6827bfad08cbc8d6..72a16f70bd5be8232b2bc6caf489c64e
     public double tridentLoyaltyVoidReturnHeight = 0.0D;
     public double voidDamageHeight = -64.0D;
     public int raidCooldownSeconds = 0;
-@@ -198,6 +199,7 @@ public class PurpurWorldConfig {
+@@ -210,6 +211,7 @@ public class PurpurWorldConfig {
         entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
         entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
--- a/patches/Purpur/patches/server/0118-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/Purpur/patches/server/0118-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
--- a/patches/Purpur/patches/server/0119-Flying-squids-Oh-my.patch
+++ b/patches/Purpur/patches/server/0119-Flying-squids-Oh-my.patch
@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Sun, 4 Oct 2020 12:00:42 -0500
+Subject: [PATCH] Flying squids! Oh my!
+
+
+diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
+index 70b952f10a2af547f58069977ee135469d02f84d..cee226501690e1c00983a01ac82bc7384f233c3c 100644
+--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
+@@ -51,6 +51,11 @@ public class EntitySquid extends EntityWaterAnimal {
+         vector.setX(cos * x - sine * z);
+         vector.setZ(sine * x + cos * z);
+     }
+
+    @Override
+    public boolean isInWater() {
+        return this.inWater || world.purpurConfig.squidsCanFly;
+    }
+     // Purpur end
+ 
+     @Override
+@@ -116,6 +121,7 @@ public class EntitySquid extends EntityWaterAnimal {
+         }
+ 
+         if (this.aH()) {
+            if (world.purpurConfig.squidsCanFly) setNoGravity(!inWater); // Purpur
+             if (this.bp < 3.1415927F) {
+                 float f = this.bp / 3.1415927F;
+ 
+@@ -323,7 +329,7 @@ public class EntitySquid extends EntityWaterAnimal {
+ 
+             if (i > 100) {
+                 this.b.a(0.0F, 0.0F, 0.0F);
+-            } else if (this.b.getRandom().nextInt(50) == 0 || !this.b.inWater || !this.b.eK()) {
+            } else if (this.b.getRandom().nextInt(50) == 0 || !this.b.isInWater() || !this.b.eK()) { // Purpur
+                 float f = this.b.getRandom().nextFloat() * 6.2831855F;
+                 float f1 = MathHelper.cos(f) * 0.2F;
+                 float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F;
+diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+index 643dfd2f50939708fa6f3127ca371674f69f6527..06c23ba2eefd1ed6b0deddd3aee3604fae58f493 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+@@ -877,10 +877,12 @@ public class PurpurWorldConfig {
+     public boolean squidRidable = false;
+     public boolean squidImmuneToEAR = true;
+     public double squidOffsetWaterCheck = 0.0D;
+    public boolean squidsCanFly = false;
+     private void squidSettings() {
+         squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
+         squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
+         squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
+        squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
+     }
+ 
+     public boolean spiderRidable = false;
--- a/patches/Purpur/patches/server/0120-Infinity-bow-settings.patch
+++ b/patches/Purpur/patches/server/0120-Infinity-bow-settings.patch
@ -26,10 +26,10 @@ index dd6a93dc78a4589f2c65d1738c432def1285f3e2..8241f3dafa5852bed7a3967e7260b36f
                     entityhuman.b(StatisticList.ITEM_USED.b(this));
                 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 72a16f70bd5be8232b2bc6caf489c64e34a6694c..be0adb6027fd375b02a63aaeee931f1a86d91943 100644
+index 06c23ba2eefd1ed6b0deddd3aee3604fae58f493..52d172109df33fc96ddf00b340997f61a6f247ef 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -153,6 +153,15 @@ public class PurpurWorldConfig {
+@@ -165,6 +165,15 @@ public class PurpurWorldConfig {
         idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
     }
 
--- a/patches/Purpur/patches/server/0121-Stonecutter-damage.patch
+++ b/patches/Purpur/patches/server/0121-Stonecutter-damage.patch
@ -39,10 +39,10 @@ index 33804e68931e8b4145b896eedeab79bde78779f2..fabadcd7a21b0e4ad0e2eeadcd8926df
                         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index be0adb6027fd375b02a63aaeee931f1a86d91943..c6977f68116bcbf287d10ca573311b292ec7b734 100644
+index 52d172109df33fc96ddf00b340997f61a6f247ef..0ed9e5998d00365da1cca37c9980ff0c97b1549a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -371,6 +371,11 @@ public class PurpurWorldConfig {
+@@ -383,6 +383,11 @@ public class PurpurWorldConfig {
         spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
     }
 
--- a/patches/Purpur/patches/server/0122-Configurable-daylight-cycle.patch
+++ b/patches/Purpur/patches/server/0122-Configurable-daylight-cycle.patch
@ -74,7 +74,7 @@ index 7ee7975d5569d24c836018e240ebd785a9e8fed5..6d5616dc4a899a1c01a21daece17f1c2
 
     public void doMobSpawning(boolean flag, boolean flag1) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c6977f68116bcbf287d10ca573311b292ec7b734..6761612d9a3f7fdce142c709cbb2ffec1b669094 100644
+index 0ed9e5998d00365da1cca37c9980ff0c97b1549a..4143e6d4900e1a774804e2ef69a820274cd36af1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,6 +116,13 @@ public class PurpurWorldConfig {
--- a/patches/Purpur/patches/server/0124-Infinite-fuel-furnace.patch
+++ b/patches/Purpur/patches/server/0124-Infinite-fuel-furnace.patch
@ -41,10 +41,10 @@ index e75e676d196d9f5a3409ec50645fab611b0afdad..76ea1d003b43d822e2b85eec3b874015
 
         if (flag1) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6761612d9a3f7fdce142c709cbb2ffec1b669094..3e2e915f29267544ff96a317e428a378fcf0783c 100644
+index 4143e6d4900e1a774804e2ef69a820274cd36af1..ac6db65af48222bb3d5c2234e42eb57ef2c1588d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -339,6 +339,11 @@ public class PurpurWorldConfig {
+@@ -351,6 +351,11 @@ public class PurpurWorldConfig {
         farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
     }
 
--- a/patches/Purpur/patches/server/0126-Add-tablist-suffix-option-for-afk.patch
+++ b/patches/Purpur/patches/server/0126-Add-tablist-suffix-option-for-afk.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Add tablist suffix option for afk


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9e3c85d3dd70bccdbff9663e86dd0bb449701085..54853eda0c9dd56bb25ff059030d32e97e78f829 100644
+index 6047e34c3aab912d5e4987be7eaf5184fb03d06e..e498c626d8d4adffbbc37738b3b91ac3a3084028 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1972,7 +1972,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1977,7 +1977,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         }
 
         if (world.purpurConfig.idleTimeoutUpdateTabList) {
--- a/patches/Purpur/patches/server/0127-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/Purpur/patches/server/0127-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@ -24,10 +24,10 @@ index 8dd48669c29dd51ed4d535dad0b0319f4bb2250c..099e0d3df219408ebe2a741a02e53eb9
                 return;
             }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3e2e915f29267544ff96a317e428a378fcf0783c..fe4e91ef5fca328143c2598ac5725babc5061a41 100644
+index ac6db65af48222bb3d5c2234e42eb57ef2c1588d..1db3c53b64a8cdd487e8672befa72fdda8eb30e5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -335,8 +335,10 @@ public class PurpurWorldConfig {
+@@ -347,8 +347,10 @@ public class PurpurWorldConfig {
     }
 
     public boolean farmlandGetsMoistFromBelow = false;
--- a/patches/Purpur/patches/server/0128-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/Purpur/patches/server/0128-Add-adjustable-breeding-cooldown-to-config.patch
@ -94,10 +94,10 @@ index aa1b037c0103552761b81318f1d2ad8215bd0370..91aa8a2bc111ee6935ada0ae471fe1a3
         this.generator = gen;
         this.world = new CraftWorld((WorldServer) this, gen, env);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fe4e91ef5fca328143c2598ac5725babc5061a41..d9e437014728111b17b3fdb9e723584a264b7672 100644
+index 1db3c53b64a8cdd487e8672befa72fdda8eb30e5..bc2b6e5b1b7253a64224f39ab0d39bcbd2e77996 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -208,6 +208,7 @@ public class PurpurWorldConfig {
+@@ -220,6 +220,7 @@ public class PurpurWorldConfig {
     public double tridentLoyaltyVoidReturnHeight = 0.0D;
     public double voidDamageHeight = -64.0D;
     public int raidCooldownSeconds = 0;
@ -105,7 +105,7 @@ index fe4e91ef5fca328143c2598ac5725babc5061a41..d9e437014728111b17b3fdb9e723584a
     private void miscGameplayMechanicsSettings() {
         useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-@@ -219,6 +220,7 @@ public class PurpurWorldConfig {
+@@ -231,6 +232,7 @@ public class PurpurWorldConfig {
         tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
         voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
         raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);
--- a/patches/Purpur/patches/server/0129-Make-animal-breeding-times-configurable.patch
+++ b/patches/Purpur/patches/server/0129-Make-animal-breeding-times-configurable.patch
@ -398,10 +398,10 @@ index 9ae7168595dd66860e09ef87f946b18b010e54b1..6c25f667eecdf345289a0dbf885c9d71
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09ff8e447f 100644
+index bc2b6e5b1b7253a64224f39ab0d39bcbd2e77996..280cc66097fc2161a5905ae3e308b0571172afe0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -422,10 +422,12 @@ public class PurpurWorldConfig {
+@@ -434,10 +434,12 @@ public class PurpurWorldConfig {
     public boolean beeRidable = false;
     public boolean beeRidableInWater = false;
     public double beeMaxY = 256D;
@ -414,7 +414,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean blazeRidable = false;
-@@ -442,12 +444,14 @@ public class PurpurWorldConfig {
+@@ -454,12 +456,14 @@ public class PurpurWorldConfig {
     public int catSpawnDelay = 1200;
     public int catSpawnSwampHutScanRange = 16;
     public int catSpawnVillageScanRange = 48;
@ -429,7 +429,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean caveSpiderRidable = false;
-@@ -460,10 +464,12 @@ public class PurpurWorldConfig {
+@@ -472,10 +476,12 @@ public class PurpurWorldConfig {
     public boolean chickenRidable = false;
     public boolean chickenRidableInWater = false;
     public boolean chickenRetaliate = false;
@ -442,7 +442,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean codRidable = false;
-@@ -474,10 +480,12 @@ public class PurpurWorldConfig {
+@@ -486,10 +492,12 @@ public class PurpurWorldConfig {
     public boolean cowRidable = false;
     public boolean cowRidableInWater = false;
     public int cowFeedMushrooms = 0;
@ -455,7 +455,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean creeperRidable = false;
-@@ -505,8 +513,10 @@ public class PurpurWorldConfig {
+@@ -517,8 +525,10 @@ public class PurpurWorldConfig {
     }
 
     public boolean donkeyRidableInWater = false;
@ -466,7 +466,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean drownedRidable = false;
-@@ -566,10 +576,12 @@ public class PurpurWorldConfig {
+@@ -576,10 +586,12 @@ public class PurpurWorldConfig {
     public boolean foxRidable = false;
     public boolean foxRidableInWater = false;
     public boolean foxTypeChangesWithTulips = false;
@ -479,7 +479,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean ghastRidable = false;
-@@ -614,14 +626,18 @@ public class PurpurWorldConfig {
+@@ -624,14 +636,18 @@ public class PurpurWorldConfig {
 
     public boolean hoglinRidable = false;
     public boolean hoglinRidableInWater = false;
@ -498,7 +498,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean huskRidable = false;
-@@ -666,9 +682,11 @@ public class PurpurWorldConfig {
+@@ -676,9 +692,11 @@ public class PurpurWorldConfig {
 
     public boolean llamaRidable = false;
     public boolean llamaRidableInWater = false;
@ -510,7 +510,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean llamaTraderRidable = false;
-@@ -687,28 +705,36 @@ public class PurpurWorldConfig {
+@@ -697,28 +715,36 @@ public class PurpurWorldConfig {
 
     public boolean mooshroomRidable = false;
     public boolean mooshroomRidableInWater = false;
@ -547,7 +547,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean parrotRidable = false;
-@@ -772,10 +798,12 @@ public class PurpurWorldConfig {
+@@ -782,10 +808,12 @@ public class PurpurWorldConfig {
     public boolean pigRidable = false;
     public boolean pigRidableInWater = false;
     public boolean pigGiveSaddleBack = false;
@ -560,7 +560,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean piglinRidable = false;
-@@ -803,12 +831,14 @@ public class PurpurWorldConfig {
+@@ -813,12 +841,14 @@ public class PurpurWorldConfig {
     public boolean polarBearRidableInWater = false;
     public String polarBearBreedableItemString = "";
     public Item polarBearBreedableItem = null;
@ -575,7 +575,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean pufferfishRidable = false;
-@@ -820,11 +850,13 @@ public class PurpurWorldConfig {
+@@ -830,11 +860,13 @@ public class PurpurWorldConfig {
     public boolean rabbitRidableInWater = false;
     public double rabbitNaturalToast = 0.0D;
     public double rabbitNaturalKiller = 0.0D;
@ -589,7 +589,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean ravagerRidable = false;
-@@ -841,9 +873,11 @@ public class PurpurWorldConfig {
+@@ -851,9 +883,11 @@ public class PurpurWorldConfig {
 
     public boolean sheepRidable = false;
     public boolean sheepRidableInWater = false;
@ -601,7 +601,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean shulkerRidable = false;
-@@ -919,9 +953,11 @@ public class PurpurWorldConfig {
+@@ -931,9 +965,11 @@ public class PurpurWorldConfig {
 
     public boolean striderRidable = false;
     public boolean striderRidableInWater = false;
@ -613,7 +613,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean tropicalFishRidable = false;
-@@ -931,9 +967,11 @@ public class PurpurWorldConfig {
+@@ -943,9 +979,11 @@ public class PurpurWorldConfig {
 
     public boolean turtleRidable = false;
     public boolean turtleRidableInWater = false;
@ -625,7 +625,7 @@ index d9e437014728111b17b3fdb9e723584a264b7672..705e8153fc6ca92fa6f0132498027d09
     }
 
     public boolean vexRidable = false;
-@@ -1026,9 +1064,11 @@ public class PurpurWorldConfig {
+@@ -1038,9 +1076,11 @@ public class PurpurWorldConfig {
 
     public boolean wolfRidable = false;
     public boolean wolfRidableInWater = false;
--- a/patches/Purpur/patches/server/0130-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/Purpur/patches/server/0130-Apply-display-names-from-item-forms-of-entities-to-e.patch
@ -188,7 +188,7 @@ index a4edfb02fd350433020b0f3699726b6127ab9933..3f9062d8eca3ce53c0fb9e9e40330aa4
         NBTTagCompound nbttagcompound = this.a("display");
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 705e8153fc6ca92fa6f0132498027d09ff8e447f..9be0daea2efb9debec13e8a695e540798f39bcce 100644
+index 280cc66097fc2161a5905ae3e308b0571172afe0..14440adbca4d589e172e67b669d4d5799286d085 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -83,8 +83,10 @@ public class PurpurWorldConfig {
@ -202,7 +202,7 @@ index 705e8153fc6ca92fa6f0132498027d09ff8e447f..9be0daea2efb9debec13e8a695e54079
         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
     }
 
-@@ -205,6 +207,7 @@ public class PurpurWorldConfig {
+@@ -217,6 +219,7 @@ public class PurpurWorldConfig {
     public boolean entitiesCanUsePortals = true;
     public boolean milkCuresBadOmen = true;
     public boolean persistentTileEntityDisplayNames = false;
@ -210,7 +210,7 @@ index 705e8153fc6ca92fa6f0132498027d09ff8e447f..9be0daea2efb9debec13e8a695e54079
     public double tridentLoyaltyVoidReturnHeight = 0.0D;
     public double voidDamageHeight = -64.0D;
     public int raidCooldownSeconds = 0;
-@@ -217,6 +220,7 @@ public class PurpurWorldConfig {
+@@ -229,6 +232,7 @@ public class PurpurWorldConfig {
         entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
         persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
--- a/patches/Purpur/patches/server/0131-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
+++ b/patches/Purpur/patches/server/0131-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
@ -21,7 +21,7 @@ index 01163ce38602f9345f00ee0535b4e73be7c6d735..a7efce97318fcf95d98f33ad4ac2da69
                     ((EntityInsentient) entityliving).setPersistent();
                 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9be0daea2efb9debec13e8a695e540798f39bcce..29c5a182aef7631a33f691c312d83f08cc383ec4 100644
+index 14440adbca4d589e172e67b669d4d5799286d085..3d3d718bff710f0ea9e699e2acc82c4c68e65f3d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -84,9 +84,11 @@ public class PurpurWorldConfig {
--- a/Show More
+++ b/Show More