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

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.0.0" apply false
-    id("io.papermc.paperweight.patcher") version "1.1.6"
+    id("io.papermc.paperweight.patcher") version "1.1.7"
 }
 
 repositories {
@@ -71,19 +71,4 @@ paperweight {
             serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server"))
         }
     }
-
-    useStandardUpstream("tuinity") {
-        url.set(github("pl3xgaming", "Tuinity"))
-        ref.set(providers.gradleProperty("tuinityCommit"))
-
-        withStandardPatcher {
-            baseName("Tuinity")
-
-            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
-            apiOutputDir.set(layout.projectDirectory.dir("Purpur-API"))
-
-            serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
-            serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server"))
-        }
-    }
 }

gradle.properties

@@ -4,8 +4,7 @@ version = 1.17-R0.1-SNAPSHOT
 mcVersion = 1.17
 packageVersion = 1_17_R1
 
-paperCommit = 1c77d647136053dd15098ee6d971b4c428f42bfa
+paperCommit = 0ad55267a387bf9cea3b6d0caeb843b3253cca65
-tuinityCommit = 30b16d03f643d809ea96faf4085a954dd38d0013
 
 org.gradle.parallel = true
 org.gradle.vfs.watch = false

patches/api/0001-Tuinity-API-Changes.patch

@@ -0,0 +1,128 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Initial Source <auto@mated.null>
+Date: Sat, 26 Jun 2021 23:30:37 -0500
+Subject: [PATCH] Tuinity API Changes
+
+
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index e88b47a838dc472ad64271a518ee1789f7be19fa..f55ae8275c297c4c86215fba8d7197ffe9715879 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1606,6 +1606,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+         }
+         // Paper end
+ 
++        // Tuinity start - add config to timings report
++        @NotNull
++        public org.bukkit.configuration.file.YamlConfiguration getTuinityConfig()
++        {
++            throw new UnsupportedOperationException("Not supported yet.");
++        }
++        // Tuinity end - add config to timings report
++
+         /**
+          * Sends the component to the player
+          *
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index 8ae9198ba7fdb006dc420504a984627add20dbb5..4017cc64532a9a8e42c3a6492878cd96db13fcb3 100644
+--- a/src/main/java/org/bukkit/World.java
++++ b/src/main/java/org/bukkit/World.java
+@@ -3639,6 +3639,26 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
+      * @param viewDistance view distance in [2, 32]
+      */
+     void setNoTickViewDistance(int viewDistance);
++
++    // Tuinity start - add view distances
++    /**
++     * Gets the sending view distance for this world.
++     * <p>
++     * Sending view distance is the view distance where chunks will load in for players in this world.
++     * </p>
++     * @return The sending view distance for this world.
++     */
++    public int getSendViewDistance();
++
++    /**
++     * Sets the sending view distance for this world.
++     * <p>
++     * Sending view distance is the view distance where chunks will load in for players in this world.
++     * </p>
++     * @param viewDistance view distance in [2, 32] or -1
++     */
++    public void setSendViewDistance(int viewDistance);
++    // Tuinity end - add view distances
+     // Paper end - view distance api
+ 
+     // Spigot start
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index da83b4cbed0be6f693c7cbb1cc032356f12d7883..51c334f68052f58fbb9c10fb9ed31ab42780ceac 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -1818,23 +1818,63 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * Gets the view distance for this player
+      *
+      * @return the player's view distance
+-     * @deprecated This is unimplemented and <i>will</i> throw an exception at runtime. The {@link org.bukkit.World World}-based methods still work.
++     * // Tuinity - implemented
+      * @see org.bukkit.World#getViewDistance()
+      * @see org.bukkit.World#getNoTickViewDistance()
+      */
+-    @Deprecated
++    //@Deprecated // Tuinity - implemented
+     public int getViewDistance();
+ 
+     /**
+      * Sets the view distance for this player
+      *
+      * @param viewDistance the player's view distance
+-     * @deprecated This is unimplemented and <i>will</i> throw an exception at runtime. The {@link org.bukkit.World World}-based methods still work.
++     * // Tuinity - implemented
+      * @see org.bukkit.World#setViewDistance(int)
+      * @see org.bukkit.World#setNoTickViewDistance(int)
+      */
+-    @Deprecated
++    //@Deprecated // Tuinity - implemented
+     public void setViewDistance(int viewDistance);
++
++    // Tuinity start - add view distances api
++    /**
++     * Gets the no-ticking view distance for this player.
++     * <p>
++     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
++     * be set to tick.
++     * </p>
++     * @return The no-tick view distance for this player.
++     */
++    public int getNoTickViewDistance();
++
++    /**
++     * Sets the no-ticking view distance for this player.
++     * <p>
++     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
++     * be set to tick.
++     * </p>
++     * @param viewDistance view distance in [2, 32] or -1
++     */
++    public void setNoTickViewDistance(int viewDistance);
++
++    /**
++     * Gets the sending view distance for this player.
++     * <p>
++     * Sending view distance is the view distance where chunks will load in for players.
++     * </p>
++     * @return The sending view distance for this player.
++     */
++    public int getSendViewDistance();
++
++    /**
++     * Sets the sending view distance for this player.
++     * <p>
++     * Sending view distance is the view distance where chunks will load in for players.
++     * </p>
++     * @param viewDistance view distance in [2, 32] or -1
++     */
++    public void setSendViewDistance(int viewDistance);
++    // Tuinity end - add view distances api
+     // Paper end
+ 
+     /**

patches/api/0002-Build-System-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6d04816e22f44a33c001d2b7e080402fba6af86c..d63d357d1357bfb8ffae09cb7ba0cd361f09f4e5 100644
+index e142072f31a41b25ac637970f79e71ab70c2f28c..407bf7c09304c76ef1dbec43bb5d665f02ce4840 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -27,6 +27,7 @@ dependencies {

patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch

@@ -72,7 +72,7 @@ index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff1
          return server.getShutdownMessage();
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 31b776d35786a932eb912010778ff83b35244f6d..8d3c9a355bea2b217f69f6eb70e0962a370e09b8 100644
+index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059c9dd9526 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -250,7 +250,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -170,7 +170,7 @@ index cdcf02ff9e80f5908a8fa22e82701445d5e2d298..83eba2421cdfa56c2f5b9ebaac18d563
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f1e5727e5ff8db2195d1f80a4938c1d9b05718cc..9f2bab23c0e11532816381e54591aa10b2b30d9b 100644
+index 93d9e1b7b4ac9b9ccee7006375d5a96eaf9508ca..2c9860d7e55d254e3b201f4580ac400090ffe6e1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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