Update Tuinity patches

patches/api/0002-Tuinity-API-Patches.patch

@@ -1,16 +1,18 @@
-From 9c22c9759cf1460418eecb1224cc0bec509de0fa Mon Sep 17 00:00:00 2001
+From e20cb2d48ea29c7f5330233ade4aa7a5ef2b156b Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 14 Dec 2018 21:52:29 -0800
 Subject: [PATCH] Tuinity API Patches
 
 ---
- pom.xml                                     |  8 ++++--
+ pom.xml                                       |  8 ++++--
- src/main/java/org/bukkit/World.java         | 28 +++++++++++++++++++++
+ .../java/co/aikar/timings/TimingsExport.java  |  3 +-
- src/main/java/org/bukkit/entity/Player.java | 23 +++++++++++++++++
+ src/main/java/org/bukkit/Server.java          |  8 ++++++
- 3 files changed, 57 insertions(+), 2 deletions(-)
+ src/main/java/org/bukkit/World.java           | 28 +++++++++++++++++++
+ src/main/java/org/bukkit/entity/Player.java   | 23 +++++++++++++++
+ 5 files changed, 67 insertions(+), 3 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 58a1f7d0..19d003fa 100644
+index 58a1f7d07..19d003fa8 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -18,8 +18,8 @@
@@ -35,8 +37,41 @@ index 58a1f7d0..19d003fa 100644
                  <dependencies>
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
+diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
+index 93d5a3f97..cb92d7b21 100644
+--- a/src/main/java/co/aikar/timings/TimingsExport.java
++++ b/src/main/java/co/aikar/timings/TimingsExport.java
+@@ -206,7 +206,8 @@ class TimingsExport extends Thread {
+         parent.put("config", createObject(
+             pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+-            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
++            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
++            pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
+         ));
+ 
+         new TimingsExport(listeners, parent, history).start();
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 80f9abdca..55ec8d2d0 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1371,6 +1371,14 @@ public interface Server extends PluginMessageRecipient {
+         }
+         // 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 af0637f7..a3ed3154 100644
+index af0637f76..a3ed3154a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -3165,6 +3165,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -75,7 +110,7 @@ index af0637f7..a3ed3154 100644
      public class Spigot {
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 877ea4f3..5367975a 100644
+index 877ea4f32..5367975ac 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1969,6 +1969,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -1,36 +1,37 @@
-From 713489b865ff4aa3f8597b6415fe0b345156c504 Mon Sep 17 00:00:00 2001
+From bb9d00d17399d52be12b31df4b9a29c10c196ea8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:30:03 -0600
 Subject: [PATCH] Purpur config files
 
 ---
- .../java/co/aikar/timings/TimingsExport.java  | 24 ++++++++++++++++---
+ .../java/co/aikar/timings/TimingsExport.java  | 25 ++++++++++++++++---
- src/main/java/org/bukkit/Server.java          | 17 +++++++++++++
+ src/main/java/org/bukkit/Server.java          | 12 +++++++++
- 2 files changed, 38 insertions(+), 3 deletions(-)
+ 2 files changed, 33 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 93d5a3f9..b5111928 100644
+index cb92d7b21..41dc89d99 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -204,9 +204,14 @@ class TimingsExport extends Thread {
+@@ -204,10 +204,14 @@ class TimingsExport extends Thread {
          // Information on the users Config
  
          parent.put("config", createObject(
 -            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
 -            pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
--            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
+-            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
+-            pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
 +                // Purpur start
 +                pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
 +                pair("bukkit.yml", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
 +                pair("spigot.yml", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-+                pair("paper.yml", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
++                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
-+                pair("tuinity.yml", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)),
++                pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)), // Tuinity - add config to timings report
 +                pair("purpur.yml", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
 +                // Purpur end
          ));
  
          new TimingsExport(listeners, parent, history).start();
-@@ -247,6 +252,19 @@ class TimingsExport extends Thread {
+@@ -248,6 +252,19 @@ class TimingsExport extends Thread {
          return timingsCost;
      }
  
@@ -51,20 +52,15 @@ index 93d5a3f9..b5111928 100644
  
          JSONObject object = new JSONObject();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 80f9abdc..739182ef 100644
+index 55ec8d2d0..d85c215e4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1371,6 +1371,23 @@ public interface Server extends PluginMessageRecipient {
+@@ -1379,6 +1379,18 @@ public interface Server extends PluginMessageRecipient {
          }
-         // Paper end
+         // Tuinity end - add config to timings report
  
 +        // Purpur start
 +        @NotNull
-+        public org.bukkit.configuration.file.YamlConfiguration getTuinityConfig() {
-+            throw new UnsupportedOperationException("Not supported yet.");
-+        }
-+
-+        @NotNull
 +        public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig() {
 +            throw new UnsupportedOperationException("Not supported yet.");
 +        }

patches/api/0010-Add-tick-times-API.patch

@@ -1,4 +1,4 @@
-From 56c9dfec5e48c93e44bf73e8d841c851202320c2 Mon Sep 17 00:00:00 2001
+From 8b372c69f358a53c1bb457358903de56bb174013 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 00:41:08 -0600
 Subject: [PATCH] Add tick times API
@@ -9,7 +9,7 @@ Subject: [PATCH] Add tick times API
  2 files changed, 38 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3a60094a..6935cf27 100644
+index 3a60094a1..6935cf272 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1664,4 +1664,25 @@ public final class Bukkit {
@@ -39,10 +39,10 @@ index 3a60094a..6935cf27 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0f7e84fb..df1765b5 100644
+index 69a100a6b..e7166bcd4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1470,4 +1470,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1473,4 +1473,21 @@ public interface Server extends PluginMessageRecipient {
       */
      int getCurrentTick();
      // Paper end

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

@@ -1,4 +1,4 @@
-From 33ce16852b951902d8a9685c5a65837796e94ebf Mon Sep 17 00:00:00 2001
+From f2745516a51e9bf2765e629bdc036c3af1b5ebb9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:18:40 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6935cf27..abf7caf0 100644
+index 6935cf272..abf7caf0b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1666,6 +1666,15 @@ public final class Bukkit {
@@ -29,10 +29,10 @@ index 6935cf27..abf7caf0 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index df1765b5..39d933aa 100644
+index e7166bcd4..f6119933d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1472,6 +1472,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1475,6 +1475,13 @@ public interface Server extends PluginMessageRecipient {
      // Paper end
  
      // Purpur start

patches/api/0015-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 2ca955541330acf8eef7244843b91694407e881b Mon Sep 17 00:00:00 2001
+From 9f6e4fe83868940e79f893f78c6e8ee5807ef9e9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement lagging threshold
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index abf7caf0..c9fc59a2 100644
+index abf7caf0b..c9fc59a2e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1675,6 +1675,15 @@ public final class Bukkit {
@@ -29,10 +29,10 @@ index abf7caf0..c9fc59a2 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 39d933aa..eba6a7a7 100644
+index f6119933d..c99ce2d89 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1479,6 +1479,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1482,6 +1482,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      String getServerName();
  

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

@@ -1,20 +1,19 @@
-From d20b11c80a0669443b803890a1549903e33010b4 Mon Sep 17 00:00:00 2001
+From b72a2a07d4fa55ddd8626cbfaa53974ebd98a748 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
 
 ---
  .../com/destroystokyo/paper/PaperConfig.java  |   2 +
- .../tuinity/tuinity/config/TuinityConfig.java |   2 +-
  .../net/minecraft/server/DedicatedServer.java |   9 +
  src/main/java/net/minecraft/server/World.java |   2 +
  src/main/java/net/pl3x/purpur/Metrics.java    | 598 ++++++++++++++++++
  .../java/net/pl3x/purpur/PurpurCommand.java   |  66 ++
  .../java/net/pl3x/purpur/PurpurConfig.java    | 135 ++++
  .../net/pl3x/purpur/PurpurWorldConfig.java    |  67 ++
- .../org/bukkit/craftbukkit/CraftServer.java   |  20 +
+ .../org/bukkit/craftbukkit/CraftServer.java   |  15 +
  .../java/org/bukkit/craftbukkit/Main.java     |   8 +
- 10 files changed, 908 insertions(+), 1 deletion(-)
+ 9 files changed, 902 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/Metrics.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -37,19 +36,6 @@ index 1d7d1ffbf7..d886f1d145 100644
      }
  
      static void readConfig(Class<?> clazz, Object instance) {
-diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index feec44f572..8867338652 100644
---- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-@@ -19,7 +19,7 @@ public final class TuinityConfig {
-     private static final Object[] EMPTY = new Object[0];
- 
-     private static File configFile;
--    private static YamlConfiguration config;
-+    public static YamlConfiguration config; // Purpur - private -> public
-     private static int configVersion;
- 
-     public static void init(final File file) {
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
 index ede4369399..8c7156bb52 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -71,13 +57,13 @@ index ede4369399..8c7156bb52 100644
          // Paper end
          com.tuinity.tuinity.config.TuinityConfig.init((File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5f69a018d9..5afd548aa0 100644
+index 2b5d0ecd0d..c50f5991b8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -83,6 +83,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
-     public final com.tuinity.tuinity.config.TuinityConfig.WorldConnfig tuinityConfig; // Tuinity - Server Config
+     public final com.tuinity.tuinity.config.TuinityConfig.WorldConfig tuinityConfig; // Tuinity - Server Config
 +    public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
  
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
@@ -85,7 +71,7 @@ index 5f69a018d9..5afd548aa0 100644
 @@ -134,6 +135,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
-         this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConnfig(worlddata.getName()); // Tuinity - Server Config
+         this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(worlddata.getName()); // Tuinity - Server Config
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
@@ -981,7 +967,7 @@ index 0000000000..eda37fa43f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3a0e027e67..d293bf27ac 100644
+index 2be7962bc5..811fe92e32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -807,6 +807,7 @@ public final class CraftServer implements Server {
@@ -1008,17 +994,12 @@ index 3a0e027e67..d293bf27ac 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2087,6 +2090,23 @@ public final class CraftServer implements Server {
+@@ -2095,6 +2098,18 @@ public final class CraftServer implements Server {
-             return com.destroystokyo.paper.PaperConfig.config;
          }
+         // Tuinity end - add config to timings report
  
 +        // Purpur start
 +        @Override
-+        public YamlConfiguration getTuinityConfig() {
-+            return com.tuinity.tuinity.config.TuinityConfig.config;
-+        }
-+
-+        @Override
 +        public YamlConfiguration getPurpurConfig() {
 +            return net.pl3x.purpur.PurpurConfig.config;
 +        }

patches/server/0006-Ridables.patch

@@ -1,4 +1,4 @@
-From 781c2279df8a30208dc342bd2a934263ffe4a841 Mon Sep 17 00:00:00 2001
+From 1ed8b405e0919cdc05075a5a5cac43c956531b09 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
@@ -195,7 +195,7 @@ index 816d301f1c..f7344d3aec 100644
          this.C = true;
          return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3cdba5c42a..b0942bde3f 100644
+index 223ad3965c..bb1ceced7e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -234,7 +234,7 @@ index 3cdba5c42a..b0942bde3f 100644
      private float headHeight;
      // CraftBukkit start
      public boolean persist = true;
-@@ -933,6 +933,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -950,6 +950,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return vec3d1;
      }
  
@@ -242,7 +242,7 @@ index 3cdba5c42a..b0942bde3f 100644
      public static double b(Vec3D vec3d) {
          return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
      }
-@@ -1259,6 +1260,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1276,6 +1277,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return flag;
      }
  
@@ -250,7 +250,7 @@ index 3cdba5c42a..b0942bde3f 100644
      private boolean l() {
          return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
      }
-@@ -1272,8 +1274,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1289,8 +1291,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain() || this.l();
      }
  
@@ -261,7 +261,7 @@ index 3cdba5c42a..b0942bde3f 100644
      }
  
      public boolean aA() {
-@@ -1404,6 +1407,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1421,6 +1424,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.inLava;
      }
  
@@ -269,7 +269,7 @@ index 3cdba5c42a..b0942bde3f 100644
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2232,7 +2236,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2249,7 +2253,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -284,7 +284,7 @@ index 3cdba5c42a..b0942bde3f 100644
          }
          return true; // CraftBukkit
      }
-@@ -2267,6 +2277,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2284,6 +2294,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -297,7 +297,7 @@ index 3cdba5c42a..b0942bde3f 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2435,6 +2451,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2452,6 +2468,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -305,7 +305,7 @@ index 3cdba5c42a..b0942bde3f 100644
      public boolean bt() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2653,6 +2670,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2670,6 +2687,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -313,7 +313,7 @@ index 3cdba5c42a..b0942bde3f 100644
      public void l(float f) {}
  
      public boolean bA() {
-@@ -3498,4 +3516,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3515,4 +3533,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          void accept(Entity entity, double d0, double d1, double d2);
      }
@@ -5144,7 +5144,7 @@ index 0c7f094e54..62a0810062 100644
          return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5afd548aa0..0cf3a64fcf 100644
+index c50f5991b8..ae3073bd54 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -987,6 +987,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0018-Cows-eat-mushrooms.patch

@@ -1,4 +1,4 @@
-From fee8e53ea5fb39b146f36a2059740a016eb6d054 Mon Sep 17 00:00:00 2001
+From 1380c4e6cc72f150422148205ee525f5f4c78811 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] Cows eat mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
  4 files changed, 77 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b0942bde3f..290607b66a 100644
+index bb1ceced7e..2ebeb8a530 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1157,6 +1157,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1174,6 +1174,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -22,7 +22,7 @@ index b0942bde3f..290607b66a 100644
      public void a(SoundEffect soundeffect, float f, float f1) {
          if (!this.isSilent()) {
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
-@@ -2697,6 +2698,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2714,6 +2715,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  

patches/server/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -1,4 +1,4 @@
-From 96d6a347eb4216c8839ef50b5fe78d0c0dee46f6 Mon Sep 17 00:00:00 2001
+From 00240511775eaed6caceb9470036aff670cbf305 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -25,10 +25,10 @@ index f7344d3aec..f6c0165f94 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 290607b66a..4f280aca7b 100644
+index 2ebeb8a530..c7fa9bc0bc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1504,6 +1504,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1521,6 +1521,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -36,7 +36,7 @@ index 290607b66a..4f280aca7b 100644
      public double h(Entity entity) {
          return this.c(entity.getPositionVector());
      }
-@@ -2027,14 +2028,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2044,14 +2045,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(new ItemStack(imaterial), (float) i);
      }
  

patches/server/0032-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From 80c196a657bccec715d713dc5a40dcb47052f9ca Mon Sep 17 00:00:00 2001
+From 16f84e5613b816087c467ed8acb54908279e632e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4f280aca7b..e18fbfdd0a 100644
+index c7fa9bc0bc..dda36e7152 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1404,6 +1404,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1421,6 +1421,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.inLava = true;
      }
  

patches/server/0049-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From 17f5f28322f45d104920cf8fb1343e468961c57b Mon Sep 17 00:00:00 2001
+From 4a5f495a9a5c4510eb17bbe933e0a420b1f4c8d8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:52 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent
@@ -86,7 +86,7 @@ index 09c7c13183..6880cdd7f9 100644
                      break;
                      // CraftBukkit start - add the block to our list
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e18fbfdd0a..d54bd814c8 100644
+index dda36e7152..c037657ab1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -168,9 +168,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index e18fbfdd0a..d54bd814c8 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2337,6 +2337,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2354,6 +2354,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.world.getMethodProfiler().enter("portal");
                      this.ag = i;
                      this.portalCooldown = this.ba();
@@ -141,7 +141,7 @@ index f84dd6d9be..f50e9670bc 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f19ef4d11c..eae1f79009 100644
+index 5d14939873..1a2a1be545 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -65,7 +65,7 @@ public class WorldServer extends World {

patches/server/0051-Add-tick-times-API.patch

@@ -1,4 +1,4 @@
-From c38297ba3c2cb464c63bce271ae3ab538915645c Mon Sep 17 00:00:00 2001
+From d5c4ac70d6e1ba686d3e6869cbe6f5042282df1e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 00:41:24 -0600
 Subject: [PATCH] Add tick times API
@@ -69,10 +69,10 @@ index f2a8af48df..0889cef15d 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d293bf27ac..32238d13b1 100644
+index 811fe92e32..16da82abdb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2233,4 +2233,16 @@ public final class CraftServer implements Server {
+@@ -2236,4 +2236,16 @@ public final class CraftServer implements Server {
          return net.minecraft.server.MinecraftServer.currentTick;
      }
      // Paper end

patches/server/0053-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 001bc8e16f69116a1854b1aa9998899694d4cb6b Mon Sep 17 00:00:00 2001
+From e2a58e67b5ef7f48de8d212f4bfebe4713cd8c39 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -46,10 +46,10 @@ index e1a1ef860a..2537a5add3 100644
      public static double packetRateLimitInterval = 10.0; // seconds
      public static String packetRateLimitKickMessage = "Sent too many packets";
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 32238d13b1..7104f58fb2 100644
+index 16da82abdb..393259e717 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2244,5 +2244,10 @@ public final class CraftServer implements Server {
+@@ -2247,5 +2247,10 @@ public final class CraftServer implements Server {
      public double getAverageTickTime() {
          return getServer().tickTimes5s.getAverage();
      }

patches/server/0057-Ladders-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From 3dbb1399beea2403ac2557977c1a4b422cb1f79f Mon Sep 17 00:00:00 2001
+From 469f78d5ce5d5d777fcdea6f087d2622aa3b6497 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,10 +17,10 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
  10 files changed, 25 insertions(+), 9 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d54bd814c8..00a8df8a7f 100644
+index c037657ab1..bbe5a66398 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1631,6 +1631,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1648,6 +1648,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isCollidable() {

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

@@ -1,4 +1,4 @@
-From 70088621f34c43fd2bcc63ce1409780f8c875aed Mon Sep 17 00:00:00 2001
+From 61fa60bd5c0da1ec64de4fe0fe29381391439cee Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index 0c3ec83570..309f5562b8 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7104f58fb2..7a2dfb6bc9 100644
+index 393259e717..3c534f50b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2235,6 +2235,11 @@ public final class CraftServer implements Server {
+@@ -2238,6 +2238,11 @@ public final class CraftServer implements Server {
      // Paper end
  
      // Purpur start

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

@@ -1,4 +1,4 @@
-From 2a32d1e318c8d4b1e9178fcd1db43b4ee7cdbf64 Mon Sep 17 00:00:00 2001
+From ae26238039bd063633fde5b4401e0aa88c100232 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -34,10 +34,10 @@ index d529b795c5..e883365b0b 100644
                      // Paper start
                      if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 00a8df8a7f..dd174f5065 100644
+index bbe5a66398..3df08409ba 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1648,6 +1648,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1665,6 +1665,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  

patches/server/0100-Add-item-entity-options.patch

@@ -1,4 +1,4 @@
-From 72665a928fc6af9a009329f0ea38bff623b57f70 Mon Sep 17 00:00:00 2001
+From 55263bf6667b4f528fd155ec71e9aa976df758b3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options
@@ -10,10 +10,10 @@ Subject: [PATCH] Add item entity options
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dd174f5065..b45472b008 100644
+index 3df08409ba..51ad50d5a1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1379,6 +1379,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1396,6 +1396,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  

patches/server/0102-Configurable-void-damage-height.patch

@@ -1,4 +1,4 @@
-From 06e1fa817f67f44bb929c7a8cfa9cee651a8e8ad Mon Sep 17 00:00:00 2001
+From f7b6a8e0feadf16e1f097f60b22ecf798baa1d05 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 21:42:19 -0600
 Subject: [PATCH] Configurable void damage height
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable void damage height
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b45472b008..8e3f672bcc 100644
+index 51ad50d5a1..834abc5c69 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -570,7 +570,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -587,7 +587,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      // Paper start
      protected void performVoidDamage() {

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

@@ -1,4 +1,4 @@
-From 6b074bee911939cd4bce9cd4ad670d820652f568 Mon Sep 17 00:00:00 2001
+From 577e2b1ecdfedaf47769b1c4121007880c9774d9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix the dead lagging the server
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8e3f672bcc..d9c5c1ddc4 100644
+index 834abc5c69..c5448dd0a0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1465,7 +1465,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1482,7 +1482,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
          this.lastYaw = this.yaw;
          this.lastPitch = this.pitch;