Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
12dec20 Bump paerweight to 1.1.7
e33ed89 Get short commit ref using a more proper method
7d6147d Remove now unneeded patch due to paperweight 1.1.7
e72fa41 Update task dependency for includeMappings so the new task isn't skipped
0ad5526 Trim whitspace off of git hash (oops)

Tuinity Changes:
e878ba9 Update paper
2bd2849 Bring back fix codec spam patch

patches/server/0002-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c2005f46b6cf2d7f80f65dc52f9ff7cd03d0419f..92ec24aefa42e4359391e549c8dcff313c44be71 100644
+index f766183883f009368b79e1201553c184a373e2cf..fba83a632abace5c2b280ea5919175f9574429f6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,8 +30,8 @@ repositories {
@@ -63,7 +63,7 @@ index 3789df8ef9c0b4150c3baccf84dbaff57c0fb65a..43a88bc58716eef4040584944f52893c
                      if (outputStream != null) {
                          try {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 862a48eeb135e7734bafc560782f1bf92b18a020..986a2a05fae2a095b99b2ec330543cd0d2f49cde 100644
+index f3bf6270c7735869083559f907c65d95144dbe6f..4cc099b469a7554e381a6f7aceb686a94f7d6605 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1714,7 +1714,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -220,7 +220,7 @@ index 0000000000000000000000000000000000000000..cabfcebf9f944f7a2a2a1cffc7401435
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5ab5987b792eed633accbc272556086c98dc37ad..7461319b935189fae47ef24cebee0fc1e058315e 100644
+index 2aa45667054a721465f353f0500e30d90f7d16a4..c61ff190f04ac3d765d34f3eeb6a927d49f8d491 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0004-Ridables.patch

@@ -22,7 +22,7 @@ index 009febf8fccbfc9a638f018f921ebd9ec9068196..73e52022d27f59278b743c7765323f94
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 986a2a05fae2a095b99b2ec330543cd0d2f49cde..6ca331b3b5ed248c669e221079c798a85b752b68 100644
+index 4cc099b469a7554e381a6f7aceb686a94f7d6605..06177ec182d79cd101da9cd43a841656d27d6d8b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1590,6 +1590,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -4526,7 +4526,7 @@ index 69f439851fe1ff07d827eaed274940a5783d5f6c..07853aff3d42ce50799406ee1c14389b
  
      Projectile(EntityType<? extends Projectile> type, Level world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7c5ecdbd5a05ae07a440cadf79d59a439e4db524..bd0807e5647ad4745fa585bf7e6c853239cdd271 100644
+index 32f44983aaec838960e6435580ee261cfa266b53..feceb11ae27bf32db5bb3ea8f02ebaa26dc9466b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -127,4 +127,9 @@ public class PurpurConfig {

patches/server/0006-Timings-stuff.patch

@@ -55,7 +55,7 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..33263af33b4355e5079fadfcfae77d03
              String hostName = "BrokenHost";
              try {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bd0807e5647ad4745fa585bf7e6c853239cdd271..eadb1904d431f1820e0bc469361b4dbe18675d47 100644
+index feceb11ae27bf32db5bb3ea8f02ebaa26dc9466b..7c898f58e954692481753238a307ad8e107411c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -132,4 +132,10 @@ public class PurpurConfig {

patches/server/0007-Barrels-and-enderchests-6-rows.patch

@@ -142,7 +142,7 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..3b027111ed933856ae86ad5f62aac744
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 358ce4bb952fbf50bf78a35f19b4c61e6f4d1afd..7bb30fba98b5b217df72e6df5b2dc4e6082d1a6a 100644
+index 7c898f58e954692481753238a307ad8e107411c1..6388f8ebd0b2aede894da39cdab2c2965e0f231f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -138,4 +138,23 @@ public class PurpurConfig {

patches/server/0010-AFK-API.patch

@@ -177,7 +177,7 @@ index 6a4e44dd8935018d1b5283761dfb8e855be62987..afe70b0d5bd98d05bbb7afc756108f09
                  if (range < 0.0D || d < range * range) {
                      return true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 409948bf86d7b3a30106598cf9ee3cdff05b928d..3efc51e347ae0d5224eae4727867eaf1e83291b8 100644
+index 6388f8ebd0b2aede894da39cdab2c2965e0f231f..b2b3d591d86f51e5cb118e2334f840c627b5e677 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -129,8 +129,16 @@ public class PurpurConfig {

patches/server/0011-Bring-back-server-name.patch

@@ -17,7 +17,7 @@ index c9d80a5430cc66d6189bf337770af43121a5bfd5..329336d413317388455fbbf03036cee1
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4547dd9d4c1f9a35adf52c1cbbf23be9a9a23d68..67dfc1239d50a3561f5e78aa18cd4b313f58ed03 100644
+index 84858994a92380d71ae9c456853ab3ea54afa98e..8809e738bd0baa6ba18d57df14d9b95624d90d14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2543,4 +2543,11 @@ public final class CraftServer implements Server {

patches/server/0012-Configurable-server-mod-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6ca331b3b5ed248c669e221079c798a85b752b68..74fda35fa08d9d0915f724504ae1b79f51e02d2b 100644
+index 06177ec182d79cd101da9cd43a841656d27d6d8b..0e0f7d48337f261481731917aabf45d8445121a0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1715,7 +1715,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 6ca331b3b5ed248c669e221079c798a85b752b68..74fda35fa08d9d0915f724504ae1b79f
  
      public SystemReport fillSystemReport(SystemReport systemreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3efc51e347ae0d5224eae4727867eaf1e83291b8..d03bd4cab386539d8e961315e8aff40df1c6aa1f 100644
+index b2b3d591d86f51e5cb118e2334f840c627b5e677..df4f0573be672f15fedf896200206344995c333a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -141,6 +141,11 @@ public class PurpurConfig {

patches/server/0013-LivingEntity-safeFallDistance.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 904a260e997bb7c1fd391d798233079e49732ed8..71eb28891941f28bc3bcf065bf734d3fb6e8e88a 100644
+index b3921a084d20a25a6ea775faae43493030aafd77..28d5fc868498a4a6746b9defa1c06da27a4aa495 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity {
@@ -50,7 +50,7 @@ index 790f0940156b9c6d4aa1869a4ab50292faa246c5..1e748c223c223deb1465a250548b39ed
  
      protected int getInventorySize() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index d95b110a025d48e7ab18f172e455593740e45252..8be06ef6e876219cb8130938fabe7ec6c99cf408 100644
+index c67f33f2e2e0ff5c2a85782185103325a6bf4535..a8ffdc8810152d77668aad7bad15a00c4d194d4c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
 @@ -12,6 +12,7 @@ import net.minecraft.world.level.LevelReader;

patches/server/0014-Lagging-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 74fda35fa08d9d0915f724504ae1b79f51e02d2b..c49c10cac87065faef025e32babfb92c1bc1b43d 100644
+index 0e0f7d48337f261481731917aabf45d8445121a0..34e364afff8cfe060244e5dd7cc0c34033dc6945 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,7 +25,7 @@ index 74fda35fa08d9d0915f724504ae1b79f51e02d2b..c49c10cac87065faef025e32babfb92c
                      }
                      // Tuinity - replace logic
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d03bd4cab386539d8e961315e8aff40df1c6aa1f..d474557f0f9a4bf54b87b596b24552b0b4b5bda5 100644
+index df4f0573be672f15fedf896200206344995c333a..77b3f9165e74c4437ca863cc9c6cbe5771faee9e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -152,6 +152,11 @@ public class PurpurConfig {
@@ -41,7 +41,7 @@ index d03bd4cab386539d8e961315e8aff40df1c6aa1f..d474557f0f9a4bf54b87b596b24552b0
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 67dfc1239d50a3561f5e78aa18cd4b313f58ed03..bcc5204d7dc2adf650fcb58b5db6523a40228465 100644
+index 8809e738bd0baa6ba18d57df14d9b95624d90d14..0b32e9acdc95ad27a43f20863aebf40fb33df207 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2549,5 +2549,10 @@ public final class CraftServer implements Server {

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

@@ -56,7 +56,7 @@ index 71030d9e156ce28f1ef9e3ed6845f022a62dfdaf..db8a8e81054e91161d43515fb19ab010
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d474557f0f9a4bf54b87b596b24552b0b4b5bda5..b6683f3abba59e309c5731c2ae48e202b66dc5f0 100644
+index 77b3f9165e74c4437ca863cc9c6cbe5771faee9e..45522d00049ee72ed3cb243c74061a08a7fecae0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -157,6 +157,11 @@ public class PurpurConfig {

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

@@ -17,7 +17,7 @@ index 7d6dc0a8ee35274052b122bbc446bc54750de0a6..c46df052a5a39d92688f51377ee1f7b5
                              }
                              // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 226bac7989ebca3ee403cf30bae25ed05c67f70f..1fc480551523065762ce58d638aba7986e829e43 100644
+index 45522d00049ee72ed3cb243c74061a08a7fecae0..d92d0052c7dc0bf63d24c442a08167de31107b23 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -180,4 +180,11 @@ public class PurpurConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send useless entity packets
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 44aa0c4ec6f0e4df2541c74fa7de852dae59bda5..1b649cb81712bd145cbbb033bcdef6f1345f843b 100644
+index a00627e0fa38632449042f59c053b4dac13e58bf..8218a074cdbe9df514f4de5aefd3c2669ec65250 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -188,6 +188,7 @@ public class ServerEntity {
@@ -40,7 +40,7 @@ index 44aa0c4ec6f0e4df2541c74fa7de852dae59bda5..1b649cb81712bd145cbbb033bcdef6f1
          this.entity.stopSeenByPlayer(player);
          player.connection.send(new ClientboundRemoveEntityPacket(this.entity.getId()));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1fc480551523065762ce58d638aba7986e829e43..c420c7ecb2ad03c808badbf7e1c77ba27d651713 100644
+index d92d0052c7dc0bf63d24c442a08167de31107b23..bb134c5f14b0d52e1e4ffeee20c2cc9293126d22 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -181,6 +181,11 @@ public class PurpurConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5d9d9d2d7a1cb68e245157e48cf938f3f7843b2f..6f854aa8dfc60ebb580a257c8d6dce93c573af15 100644
+index 182b9e850be72b72636d03c4d303fb264ca875f6..c6e33f674543841710d351235a1a2b2223422a0d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1436,7 +1436,7 @@ public class ServerPlayer extends Player {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f98f9e295a8e76a95e2afd24b1469a354fe614c5..f0abd7ab195e6cfc9ed5c87d4d8aa92abcb33cdb 100644
+index c5a3f54a590d164ec0f7794f6745ea86753a30d3..aa1d31016c89e9988976ca28ce025f675cdc4c77 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1735,6 +1735,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0056-Configurable-TPS-Catchup.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c49c10cac87065faef025e32babfb92c1bc1b43d..08789b178490acf8a6d14687e03760de983214e3 100644
+index 34e364afff8cfe060244e5dd7cc0c34033dc6945..c5f1141d46acca284f5489d68d3b628e669950cb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1255,7 +1255,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -24,7 +24,7 @@ index c49c10cac87065faef025e32babfb92c1bc1b43d..08789b178490acf8a6d14687e03760de
                      this.profiler.pop();
                      this.endMetricsRecordingTick();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6e7891dd9445345f17970731c8d1f159e358745c..9832f3cab96479ac92f26958c53de95ce70af21d 100644
+index bb134c5f14b0d52e1e4ffeee20c2cc9293126d22..052eb37087b5f97d92c00944968c13fec343d5a3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -192,4 +192,9 @@ public class PurpurConfig {

patches/server/0065-Configurable-void-damage-height-and-damage.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f0abd7ab195e6cfc9ed5c87d4d8aa92abcb33cdb..62a884b811b90d09ce1132bb26d03adcf4c56969 100644
+index aa1d31016c89e9988976ca28ce025f675cdc4c77..34349fa7a39841dad19be112eef8b02033945f3e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -767,7 +767,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 62a884b811b90d09ce1132bb26d03adcf4c56969..0961b33349ac09e182899d35b4af950babb83331 100644
+index 34349fa7a39841dad19be112eef8b02033945f3e..28a763cb92cd5c63e5f9083e451802d5b1516eb1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4262,5 +4262,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0070-Add-5-second-tps-average-in-tps.patch

@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 08789b178490acf8a6d14687e03760de983214e3..6dbc16b12b0baba016fb9c2d83facf01d94f4c59 100644
+index c5f1141d46acca284f5489d68d3b628e669950cb..9017d3626f4982a41d34d65758de4844e5502a9c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -308,7 +308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -69,7 +69,7 @@ index 08789b178490acf8a6d14687e03760de983214e3..6dbc16b12b0baba016fb9c2d83facf01
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bcc5204d7dc2adf650fcb58b5db6523a40228465..12247ec81ecc7be6e28f39cee2cfeeda52056da3 100644
+index 0b32e9acdc95ad27a43f20863aebf40fb33df207..b0a7d903696f62360a0a0b4e1a9a50cc8e5cc027 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2323,6 +2323,7 @@ public final class CraftServer implements Server {

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

@@ -17,7 +17,7 @@ index d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb..158fc5748f175708a0c3415a2217663f
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 5f6fb1ac7c4b022109e102308cb6ca4c9997e1f1..1607dfe0bccf947ef8d9618e83dbe5e537913700 100644
+index 052eb37087b5f97d92c00944968c13fec343d5a3..4f63424369ad76249bfb340e7ee23c25537546be 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,12 +133,14 @@ public class PurpurConfig {

patches/server/0074-Add-demo-command.patch

@@ -17,7 +17,7 @@ index 158fc5748f175708a0c3415a2217663f77271bc7..9cbaaf4cd138e6c1d2d51afcef24a81a
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1607dfe0bccf947ef8d9618e83dbe5e537913700..8a515bbb2f680e27bf5169992bdb3cf19297660d 100644
+index 4f63424369ad76249bfb340e7ee23c25537546be..4eccccee09c8bcb9daa264b10116f7253a737f3c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,6 +133,7 @@ public class PurpurConfig {

patches/server/0075-Add-credits-command.patch

@@ -17,7 +17,7 @@ index 9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5..f164106a957c24bdb71bde85d82948a6
              net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8a515bbb2f680e27bf5169992bdb3cf19297660d..766ec7c3e26c467b457c18a6f0b02fee0eebf88e 100644
+index 4eccccee09c8bcb9daa264b10116f7253a737f3c..49c1be11f0e1d00a9bdaaf4cca7348d0dddbfc05 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,6 +133,7 @@ public class PurpurConfig {

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

@@ -27,7 +27,7 @@ index 4fdb99240e6ebda946fd2e0a847654d92b7c56a1..e6dbe6e2d65aa4432f469910fd060649
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a2e9b3139ce8e2a9a1d294f47d77e153c51d2eb0..73d2977dda0482ff2574719dfec4ca359699c485 100644
+index d11b463548b847382a22fdf50496b186caa0c526..65aba9a17a76e56c0140220ab00645a1e02cc8b5 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1486,4 +1486,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -68,7 +68,7 @@ index df4f2c729f09d5229553308e4876f29de648543f..f2b0278679fa649bbc2904660e0dc9ab
          } else {
              world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 48ecc3a30a301e72d458367fb18d943420f04841..12915ecd4ade052427afc673e067f3a8bdac4fd9 100644
+index 49c1be11f0e1d00a9bdaaf4cca7348d0dddbfc05..98737d9dd6fe299f4c5d88d1a6a2400665f2e2bf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -192,6 +192,11 @@ public class PurpurConfig {

patches/server/0086-Configurable-feature-seed-settings.patch

@@ -835,7 +835,7 @@ index ed3944a60d09495eb424dd11d00e8c3585177d51..fcf25cc905ece0213a0eb6365a0a5756
              return false;
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 12915ecd4ade052427afc673e067f3a8bdac4fd9..66e91f78b49825615ef3761827903402ad7b1475 100644
+index 98737d9dd6fe299f4c5d88d1a6a2400665f2e2bf..8c7b8e8035e7ab91406f1a7cba7313ac9de1c742 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,5 +1,6 @@

patches/server/0092-Add-option-to-disable-certain-block-updates.patch

@@ -117,7 +117,7 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 66e91f78b49825615ef3761827903402ad7b1475..8aba62b764bbf9973dfdc4ca3ab0ce2d632c04a7 100644
+index 8c7b8e8035e7ab91406f1a7cba7313ac9de1c742..d7cce288e6eeef6d63325a4d30a03acf36933b9b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -320,6 +320,15 @@ public class PurpurConfig {

patches/server/0097-Short-enderman-height.patch

@@ -31,7 +31,7 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342
              if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
              for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8aba62b764bbf9973dfdc4ca3ab0ce2d632c04a7..a290d43d466929030a55674a811dd229b6a03196 100644
+index d7cce288e6eeef6d63325a4d30a03acf36933b9b..dcc1548a3ca7afab671ede65a8ef265e4a80772a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -3,6 +3,8 @@ package net.pl3x.purpur;

patches/server/0098-Stop-squids-floating-on-top-of-water.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0961b33349ac09e182899d35b4af950babb83331..429f710c6814ad796d78ad6d5dbbffd66c4961df 100644
+index 28a763cb92cd5c63e5f9083e451802d5b1516eb1..a4c5bf20c69432a35ce04846e49c347364ecfaff 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3832,11 +3832,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -45,10 +45,10 @@ index f96def2ebdf114823c322c2d4318d039e20eab97..2affff346a7fe81480e86cb61996039d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/phys/AABB.java b/src/main/java/net/minecraft/world/phys/AABB.java
-index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a42ce9525 100644
+index 120498a39b7ca7aee9763084507508d4a1c425aa..0dfc639043998cd3bd32afaaf8153459172cc9f9 100644
 --- a/src/main/java/net/minecraft/world/phys/AABB.java
 +++ b/src/main/java/net/minecraft/world/phys/AABB.java
-@@ -367,4 +367,10 @@ public class AABB {
+@@ -356,4 +356,10 @@ public class AABB {
      public static AABB ofSize(Vec3 center, double dx, double dy, double dz) {
          return new AABB(center.x - dx / 2.0D, center.y - dy / 2.0D, center.z - dz / 2.0D, center.x + dx / 2.0D, center.y + dy / 2.0D, center.z + dz / 2.0D);
      }

patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch

@@ -18,7 +18,7 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
      private final LevelAccessor level;
      private final Direction.Axis axis;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a290d43d466929030a55674a811dd229b6a03196..56e03e71b544eaf2f427cac2764f5c76b4b3acc5 100644
+index dcc1548a3ca7afab671ede65a8ef265e4a80772a..c620ce09ae3e10f2a28ca4301eab6ce0b4f59558 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -296,6 +296,7 @@ public class PurpurConfig {