Remove Tuinity patches (you will be missed)

current-paper

@@ -1 +1 @@
-1.15.2--e6472a7a86c9d6f4e22d44ac6859d153dbbe50a7
+1.15.2--eaffd521afe20a48228b1b25b849f969b95f23d0

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

@@ -1,37 +1,35 @@
-From bb9d00d17399d52be12b31df4b9a29c10c196ea8 Mon Sep 17 00:00:00 2001
+From cde36d86144f76c8c6ff5e9d0f3eac749580fa51 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  | 25 ++++++++++++++++---
+ .../java/co/aikar/timings/TimingsExport.java  | 23 ++++++++++++++++---
- src/main/java/org/bukkit/Server.java          | 12 +++++++++
+ src/main/java/org/bukkit/Server.java          | 12 ++++++++++
- 2 files changed, 33 insertions(+), 4 deletions(-)
+ 2 files changed, 32 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index cb92d7b21..41dc89d99 100644
+index 93d5a3f97..47be89aea 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -204,10 +204,14 @@ class TimingsExport extends Thread {
+@@ -204,9 +204,13 @@ 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)), // Tuinity - add config to timings report
+-            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
--            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", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
++                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), 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();
-@@ -248,6 +252,19 @@ class TimingsExport extends Thread {
+@@ -247,6 +251,19 @@ class TimingsExport extends Thread {
          return timingsCost;
      }
  
@@ -52,12 +50,12 @@ index cb92d7b21..41dc89d99 100644
  
          JSONObject object = new JSONObject();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 55ec8d2d0..d85c215e4 100644
+index 80f9abdca..eaaf9a4e9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1379,6 +1379,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1371,6 +1371,18 @@ public interface Server extends PluginMessageRecipient {
          }
-         // Tuinity end - add config to timings report
+         // Paper end
  
 +        // Purpur start
 +        @NotNull

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

@@ -1,148 +0,0 @@
-From ee2e3f5670923c7e90dd298163822152ec56296e 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 ++++--
- .../java/co/aikar/timings/TimingsExport.java  |  3 +-
- src/main/java/org/bukkit/Server.java          |  8 ++++++
- 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 58a1f7d07..19d003fa8 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -18,8 +18,8 @@
- 
-     <properties>
-         <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
--        <maven.compiler.source>1.8</maven.compiler.source>
--        <maven.compiler.target>1.8</maven.compiler.target>
-+        <maven.compiler.source>11</maven.compiler.source>
-+        <maven.compiler.target>11</maven.compiler.target>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     </properties>
- 
-@@ -154,6 +154,10 @@
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-compiler-plugin</artifactId>
-                 <version>3.8.1</version>
-+                <!-- Tuinity - https://issues.apache.org/jira/browse/MCOMPILER-346 -->
-+                <configuration>
-+                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
-+                </configuration>
-                 <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 db18f70ec..be92b1a3e 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -3166,6 +3166,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
-     int getViewDistance();
-     // Spigot end
- 
-+    // Tuinity start - view distance api
-+    /**
-+     * Sets the view distance for this world.
-+     * @param viewDistance view distance in [2, 32]
-+     */
-+    void setViewDistance(int viewDistance);
-+
-+    /**
-+     * Returns the no-tick view distance for this world.
-+     * <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 world.
-+     */
-+    int getNoTickViewDistance();
-+
-+    /**
-+     * Sets the no-tick view distance for this world.
-+     * <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]
-+     */
-+    void setNoTickViewDistance(int viewDistance);
-+    // Tuinity end - view distance api
-+
-     // Spigot start
-     public class Spigot {
- 
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-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
-     void resetCooldown();
-     // Paper end
- 
-+    // Tuinity start
-+    /**
-+     * Returns the no-tick 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.
-+     */
-+    int getNoTickViewDistance();
-+
-+    /**
-+     * Sets the no-tick view distance for this player. Setting to a value of -1 will default to the world no-tick
-+     * view distance.
-+     * <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
-+     */
-+    void setNoTickViewDistance(int viewDistance);
-+    // Tuinity end
-+
-     // Spigot start
-     public class Spigot extends Entity.Spigot {
- 
--- 
-2.24.0
-

patches/api/0003-Host-our-own-timings.patch

@@ -1,4 +1,4 @@
-From c9e3dae6773177302297c61c55d0bbbe9f1c6f9c Mon Sep 17 00:00:00 2001
+From efced177921197f8480a7c4e9fba2484fdd41604 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:38:26 -0600
 Subject: [PATCH] Host our own timings
@@ -8,10 +8,10 @@ Subject: [PATCH] Host our own timings
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index b5111928d..63d21ddbc 100644
+index 47be89aea..1b5767b29 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -301,7 +301,7 @@ class TimingsExport extends Thread {
+@@ -300,7 +300,7 @@ class TimingsExport extends Thread {
          String response = null;
          String timingsURL = null;
          try {

patches/api/0004-Ridables.patch

@@ -1,4 +1,4 @@
-From d8696f7eef73586001263719c3c51525c2760d13 Mon Sep 17 00:00:00 2001
+From ccac8f08b0f9555958a6bf423cbe7cbd90756fe1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Ridables

patches/api/0005-Remove-pointless-annotations-and-deprecations.patch

@@ -1,4 +1,4 @@
-From 05c1703c9edc678587fbb6a84e91edca73ec9747 Mon Sep 17 00:00:00 2001
+From 89b558740be091a89cafc861442b18d114fd2626 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 31 Dec 2019 23:00:07 -0600
 Subject: [PATCH] Remove pointless annotations and deprecations
@@ -14,7 +14,7 @@ Subject: [PATCH] Remove pointless annotations and deprecations
  7 files changed, 9 insertions(+), 18 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b9973406..3a60094a 100644
+index b99734068..3a60094a1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -851,13 +851,10 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index b9973406..3a60094a 100644
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 739182ef..0f7e84fb 100644
+index eaaf9a4e9..e8b2fe0c2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -712,13 +712,10 @@ public interface Server extends PluginMessageRecipient {
@@ -50,7 +50,7 @@ index 739182ef..0f7e84fb 100644
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
 diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java
-index 45cb8da1..383b43e1 100644
+index 45cb8da12..383b43e1b 100644
 --- a/src/main/java/org/bukkit/command/CommandExecutor.java
 +++ b/src/main/java/org/bukkit/command/CommandExecutor.java
 @@ -19,5 +19,5 @@ public interface CommandExecutor {
@@ -61,7 +61,7 @@ index 45cb8da1..383b43e1 100644
 +    public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations
  }
 diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
-index e9cf71f5..34d3462c 100644
+index e9cf71f5c..34d3462c7 100644
 --- a/src/main/java/org/bukkit/command/TabCompleter.java
 +++ b/src/main/java/org/bukkit/command/TabCompleter.java
 @@ -23,5 +23,5 @@ public interface TabCompleter {
@@ -72,7 +72,7 @@ index e9cf71f5..34d3462c 100644
 +    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index d7d6a3e8..cf8d7749 100644
+index d7d6a3e83..cf8d77491 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -100,7 +100,7 @@ index d7d6a3e8..cf8d7749 100644
          ItemMeta meta = getItemMeta();
          return (meta == null) ? 0 : (short) ((Damageable) meta).getDamage();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 04fa3991..24d65491 100644
+index 04fa3991f..24d65491c 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -122,7 +122,7 @@ index 04fa3991..24d65491 100644
      }
  
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index a48be38b..951b81e7 100644
+index a48be38b1..951b81e79 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -41,6 +41,11 @@ public class AnnotationTest {

patches/api/0006-Allow-inventory-resizing.patch

@@ -1,4 +1,4 @@
-From 3f163f0caeb3cbf242e1fc7a7d52905a36a52d72 Mon Sep 17 00:00:00 2001
+From fd0bef0590aaaa10deefcda30d4e6b7a6bde21fc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 06:50:55 -0500
 Subject: [PATCH] Allow inventory resizing

patches/api/0007-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From e9286b665d474b7569018a78f391cbea9f900994 Mon Sep 17 00:00:00 2001
+From 464c7f06726b30fef190cdffe4953f2c12a9630d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 10 Aug 2019 22:19:56 -0500
 Subject: [PATCH] Implement AFK API
@@ -87,10 +87,10 @@ index 000000000..0c8b3e5e4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5367975ac..c7cba5046 100644
+index 877ea4f32..b9fe2a0fa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2090,4 +2090,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0008-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From fb1b62df2e5107f2a3f0a8d3a99a48a6c711ed62 Mon Sep 17 00:00:00 2001
+From 07869e37e8dc3b12e9e0fa2ce5ee0a4e23e250a6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:00 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent

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

@@ -1,4 +1,4 @@
-From 8b372c69f358a53c1bb457358903de56bb174013 Mon Sep 17 00:00:00 2001
+From 9d3f33b35ebc4ff79bff98b87904592581b3ebce 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
@@ -39,10 +39,10 @@ index 3a60094a1..6935cf272 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 69a100a6b..e7166bcd4 100644
+index e8b2fe0c2..9d306c084 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1473,4 +1473,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1465,4 +1465,21 @@ public interface Server extends PluginMessageRecipient {
       */
      int getCurrentTick();
      // Paper end

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

@@ -1,4 +1,4 @@
-From f2745516a51e9bf2765e629bdc036c3af1b5ebb9 Mon Sep 17 00:00:00 2001
+From 59d3509aaea5bc9b3b15b30602af394a6ef741ec 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
@@ -29,10 +29,10 @@ index 6935cf272..abf7caf0b 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 e7166bcd4..f6119933d 100644
+index 9d306c084..89e9395e8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1475,6 +1475,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1467,6 +1467,13 @@ public interface Server extends PluginMessageRecipient {
      // Paper end
  
      // Purpur start

patches/api/0011-Implement-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 778fce635a6e952ffde90f502fe471cc363913b3 Mon Sep 17 00:00:00 2001
+From 9ca629db681febcd959f6306016d7f41f0b3346c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:19 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance

patches/api/0012-Add-ExecuteCommandEvent.patch

@@ -1,4 +1,4 @@
-From e4c1a33b0b4c1f5fab1b728f52585dd283ab9ddc Mon Sep 17 00:00:00 2001
+From d1701e7bd21359dcd6f6c376ca1d4040cf762c8b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 00:08:28 -0500
 Subject: [PATCH] Add ExecuteCommandEvent

patches/api/0013-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From 903689d819caca268cb23ae68aa7d452e89cf5e7 Mon Sep 17 00:00:00 2001
+From 24cdbc2b213aabcec55bb2ced1986b8534972b26 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:09:58 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent

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

@@ -1,4 +1,4 @@
-From 9f6e4fe83868940e79f893f78c6e8ee5807ef9e9 Mon Sep 17 00:00:00 2001
+From 0fa0f29ff2114ab2c3d770bfb54ef050bb727e87 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
@@ -29,10 +29,10 @@ index abf7caf0b..c9fc59a2e 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 f6119933d..c99ce2d89 100644
+index 89e9395e8..6f2e580ce 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1482,6 +1482,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1474,6 +1474,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      String getServerName();
  

patches/api/0015-Advancement-API-Additions.patch

@@ -1,4 +1,4 @@
-From e073e5ae742d57f67c3d9a075319d00835c1542a Mon Sep 17 00:00:00 2001
+From 027ad3f60ab42dbe2eb1078bcdb76576d911a1df Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:21 -0500
 Subject: [PATCH] Advancement API Additions

patches/api/0016-Implement-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From 5ecbac582fc2724107823f64b9adf673bdf3d84b Mon Sep 17 00:00:00 2001
+From e340688cba311b2693ce5aa181c4becdeeb6a7f7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:37:04 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg

patches/api/0017-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From 873158f78a95d7943a75f989a9f35dd8ec9831df Mon Sep 17 00:00:00 2001
+From 420c5de1e9bf05bccf77e124fd21f2cb5aa97bc7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:15 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent

patches/api/0018-Add-MonsterEggSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 78387652cf81f45c5f036d405da4daf466b1c63e Mon Sep 17 00:00:00 2001
+From d711dbe787c21f7e233d3182eb0a83ebfa5aadad Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:20:49 -0500
 Subject: [PATCH] Add MonsterEggSpawnEvent

patches/api/0019-Add-ThrownEggHatchEvent.patch

@@ -1,4 +1,4 @@
-From fbb8402a553e112483f966d23b5066dc844dcfb3 Mon Sep 17 00:00:00 2001
+From 3124545ae453199123c269ba33f19659eed3a762 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:27:55 -0500
 Subject: [PATCH] Add ThrownEggHatchEvent

patches/api/0020-Add-moon-phase-API.patch

@@ -1,4 +1,4 @@
-From 66e13328cfc3db8a10f81e958e8d760754215fd4 Mon Sep 17 00:00:00 2001
+From bf0b94205c7c7696e169389ebe93ec36f50fcfe8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 1 Feb 2020 22:22:07 -0600
 Subject: [PATCH] Add moon phase API
@@ -52,10 +52,10 @@ index 000000000..f5ad98c62
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index be92b1a3e..97441dcae 100644
+index db18f70ec..af66b8255 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3244,6 +3244,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3216,6 +3216,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public List<Raid> getRaids();
  

patches/api/0021-Add-API-for-Villager-resetOffers.patch

@@ -1,4 +1,4 @@
-From 57837a0e93830ce84c108064a1457cb59a56e385 Mon Sep 17 00:00:00 2001
+From e993accd1a71c004bd289404b8052e4e523b5a21 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 7 Oct 2019 00:15:28 -0500
 Subject: [PATCH] Add API for Villager#resetOffers()

patches/api/0022-Expose-getItemStack-for-Trident.patch

@@ -1,4 +1,4 @@
-From b51632e4cebc06f041b40c0612164edc4eccaaf6 Mon Sep 17 00:00:00 2001
+From c62e0ab72ac8f76f357effbcc8a362a2ef637b26 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:19:31 -0500
 Subject: [PATCH] Expose getItemStack for Trident

patches/api/0023-Add-more-llama-API.patch

@@ -1,4 +1,4 @@
-From dfa71eca3789c870c339374b97e07dde48bd57ef Mon Sep 17 00:00:00 2001
+From ff2ee64d734a14655665bca67ad75420b7f570ea Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:05 -0500
 Subject: [PATCH] Add more llama API

patches/api/0024-Add-more-evoker-API.patch

@@ -1,4 +1,4 @@
-From c2c0ee0dfa314e6df207e32e2bfd9516e9efa0f6 Mon Sep 17 00:00:00 2001
+From e6dd34a38b3bba976bee9a04743c910f3baccf97 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:28:53 -0500
 Subject: [PATCH] Add more evoker API

patches/api/0025-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From 0a22c90004e121545e4e96662f7ce11a53a5059d Mon Sep 17 00:00:00 2001
+From 61ba17cba901baddbda5f01637ba70794bfec56e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:36 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 97441dcae..5bf0e2252 100644
+index af66b8255..04ced7551 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3252,6 +3252,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3224,6 +3224,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      @NotNull
      net.pl3x.purpur.MoonPhase getMoonPhase();

patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From 46686f8401311206e87ecd14fef0bd3db10fda27 Mon Sep 17 00:00:00 2001
+From e35ad3105f4ef498db4bb8cf99b758c240d23c32 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:05 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity

patches/api/0027-Add-getPlayer-to-SkeletonHorseTrapEvent.patch

@@ -1,4 +1,4 @@
-From 58841d3d8e5e181681cabd0855899db6ad1dc73f Mon Sep 17 00:00:00 2001
+From c85760f19f046a8359c8c41e874d7b6d25fd8c5c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:35:24 -0500
 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent

patches/api/0028-Add-LootableInventoryFirstFillEvent.patch

@@ -1,4 +1,4 @@
-From f4f5c5f77c403730091b31b16aa5420b0186377a Mon Sep 17 00:00:00 2001
+From a4708f2c66531344b9d1e994f5a41fd553de117f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:43:10 -0500
 Subject: [PATCH] Add LootableInventoryFirstFillEvent

patches/api/0029-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch

@@ -1,4 +1,4 @@
-From fdba4b920a64e6c43993c7afa7a75c2edc13bade Mon Sep 17 00:00:00 2001
+From 95eca5bebcdcd984f891344534b2a3968260246c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:53:46 -0500
 Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon

patches/api/0030-Implement-EntityMoveEvent.patch

@@ -1,4 +1,4 @@
-From c34b526bbe4747bcfaef76680f94101a76a6bfe0 Mon Sep 17 00:00:00 2001
+From bc1a6978add0784b4b5111b4c0fba8ca2c7edbb9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 11 Feb 2020 21:56:38 -0600
 Subject: [PATCH] Implement EntityMoveEvent

patches/api/0031-Add-ItemStack-convenience-methods-for-ItemMeta.patch

@@ -1,4 +1,4 @@
-From 7b8f20e6429b26355dcab8a205ca7d491a08ee7b Mon Sep 17 00:00:00 2001
+From e957ac37c9a7393b96fbc805c4c1a8f88c7e9940 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Mar 2020 20:52:12 -0500
 Subject: [PATCH] Add ItemStack convenience methods for ItemMeta
@@ -8,7 +8,7 @@ Subject: [PATCH] Add ItemStack convenience methods for ItemMeta
  1 file changed, 590 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index cf8d7749..2c2ca7d9 100644
+index cf8d77491..2c2ca7d97 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;

patches/api/0032-Add-BellRingEvent.patch

@@ -1,4 +1,4 @@
-From 37b973d83707270ff4f9c7f5831f29279891277a Mon Sep 17 00:00:00 2001
+From 3a2edd722a0d72cb193664d7dea177f12a4d9ddd Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:39 -0700
 Subject: [PATCH] Add BellRingEvent

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

@@ -1,4 +1,4 @@
-From b72a2a07d4fa55ddd8626cbfaa53974ebd98a748 Mon Sep 17 00:00:00 2001
+From 9cf06be15c14b9550817387d504504404973951a 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
@@ -6,14 +6,14 @@ Subject: [PATCH] Purpur config files
 ---
  .../com/destroystokyo/paper/PaperConfig.java  |   2 +
  .../net/minecraft/server/DedicatedServer.java |   9 +
- src/main/java/net/minecraft/server/World.java |   2 +
+ src/main/java/net/minecraft/server/World.java |   4 +-
  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   |  15 +
  .../java/org/bukkit/craftbukkit/Main.java     |   8 +
- 9 files changed, 902 insertions(+)
+ 9 files changed, 902 insertions(+), 2 deletions(-)
  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,7 +37,7 @@ index 1d7d1ffbf7..d886f1d145 100644
  
      static void readConfig(Class<?> clazz, Object instance) {
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index ede4369399..8c7156bb52 100644
+index 349a0ea213..d70c8cab2b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -55,27 +55,31 @@ index ede4369399..8c7156bb52 100644
 +        // Purpur end
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          // 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 2b5d0ecd0d..c50f5991b8 100644
+index 5117dafbcf..1131d43269 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 {
+@@ -78,10 +78,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
-     public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
+     public long ticksPerAmbientSpawns;
- 
+     public boolean populating;
-     public final com.tuinity.tuinity.config.TuinityConfig.WorldConfig tuinityConfig; // Tuinity - Server Config
+     public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
+-
 +    public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
- 
+     public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
+     public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
+-
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPosition lastPhysicsProblem; // Spigot
-@@ -134,6 +135,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+     private org.spigotmc.TickLimiter entityLimiter;
+@@ -130,6 +129,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+     protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
+         this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
          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.WorldConfig(worlddata.getName()); // Tuinity - Server Config
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
+         this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
-         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java
 new file mode 100644
 index 0000000000..246eb8140f
@@ -967,26 +971,26 @@ index 0000000000..eda37fa43f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2be7962bc5..811fe92e32 100644
+index f70468adab..ea43602eb4 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 {
+@@ -806,6 +806,7 @@ public final class CraftServer implements Server {
+ 
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
-         com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
 +        net.pl3x.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
          for (WorldServer world : console.getWorlds()) {
              world.worldData.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -836,6 +837,7 @@ public final class CraftServer implements Server {
+@@ -834,6 +835,7 @@ public final class CraftServer implements Server {
+             }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
-             world.tuinityConfig.init(); // Tuinity - Server Config
 +            world.purpurConfig.init(); // Purpur
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -854,6 +856,7 @@ public final class CraftServer implements Server {
+@@ -852,6 +854,7 @@ public final class CraftServer implements Server {
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -994,9 +998,9 @@ index 2be7962bc5..811fe92e32 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2095,6 +2098,18 @@ public final class CraftServer implements Server {
+@@ -2082,6 +2085,18 @@ public final class CraftServer implements Server {
+             return com.destroystokyo.paper.PaperConfig.config;
          }
-         // Tuinity end - add config to timings report
  
 +        // Purpur start
 +        @Override
@@ -1014,12 +1018,12 @@ index 2be7962bc5..811fe92e32 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2666940e86..7fc56f67fd 100644
+index cb60310e63..fc2c313901 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -145,6 +145,14 @@ public class Main {
+@@ -138,6 +138,14 @@ public class Main {
                          .describedAs("Yml file");
-                 /* Conctete End - Server Config */
+                 // Paper end
  
 +                // Purpur Start
 +                acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings")

patches/server/0003-decompile-fixes.patch

@@ -1,4 +1,4 @@
-From d6363a354c2352a016afb502db274ee4b903d36d Mon Sep 17 00:00:00 2001
+From 1444823eb26c2030160e084acbf72988af64f542 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 13:39:06 -0600
 Subject: [PATCH] decompile-fixes

patches/server/0004-Add-language-asset-purpur.lang.patch

@@ -1,4 +1,4 @@
-From 8abcf16cd90b077caa223a2e4ea59ed53e939ed1 Mon Sep 17 00:00:00 2001
+From 6820d1aa5606b069c1ac73102b9bf2ee6a17ad91 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 13:17:09 -0500
 Subject: [PATCH] Add language asset purpur.lang

patches/server/0005-Fix-vanilla-command-permission-handler.patch

@@ -1,4 +1,4 @@
-From c9d297c494ef23fad49aca61b4fb0c9228a411f7 Mon Sep 17 00:00:00 2001
+From f8df3bbaaa80fa78bf8c279cef08ad1884b8945a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Mar 2020 01:51:32 -0500
 Subject: [PATCH] Fix vanilla command permission handler

patches/server/0006-Host-our-own-timings.patch

@@ -1,4 +1,4 @@
-From 96c1153195c5b212dd3d2b6d44cbec160e95a941 Mon Sep 17 00:00:00 2001
+From 528c7a2c9941aafc4c1ade433028e5946a445572 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:38:34 -0600
 Subject: [PATCH] Host our own timings

patches/server/0007-Ridables.patch

@@ -1,4 +1,4 @@
-From b3b398af1dfdf76518724e83a5ef59a323274f59 Mon Sep 17 00:00:00 2001
+From f701d39cd31b65e3109e4f7473ab07721f80913a 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
@@ -112,7 +112,7 @@ Subject: [PATCH] Ridables
  create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 1a3234bb47..71ac371f40 100644
+index c950139c0f..77cb24ef66 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -104,6 +104,7 @@ public class AxisAlignedBB {
@@ -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 d3bcecb907..c07dfd7e69 100644
+index 8974c16bf9..0b9112c1b4 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 d3bcecb907..c07dfd7e69 100644
      private float headHeight;
      // CraftBukkit start
      public boolean persist = true;
-@@ -984,6 +984,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -814,6 +814,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return vec3d1;
      }
  
@@ -242,7 +242,7 @@ index d3bcecb907..c07dfd7e69 100644
      public static double b(Vec3D vec3d) {
          return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
      }
-@@ -1310,6 +1311,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1140,6 +1141,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return flag;
      }
  
@@ -250,7 +250,7 @@ index d3bcecb907..c07dfd7e69 100644
      private boolean l() {
          return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
      }
-@@ -1323,8 +1325,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1153,8 +1155,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain() || this.l();
      }
  
@@ -261,7 +261,7 @@ index d3bcecb907..c07dfd7e69 100644
      }
  
      public boolean aA() {
-@@ -1455,6 +1458,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1285,6 +1288,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.inLava;
      }
  
@@ -269,7 +269,7 @@ index d3bcecb907..c07dfd7e69 100644
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2283,7 +2287,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2112,7 +2116,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -284,7 +284,7 @@ index d3bcecb907..c07dfd7e69 100644
          }
          return true; // CraftBukkit
      }
-@@ -2318,6 +2328,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2147,6 +2157,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -297,7 +297,7 @@ index d3bcecb907..c07dfd7e69 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2486,6 +2502,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2315,6 +2331,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -305,7 +305,7 @@ index d3bcecb907..c07dfd7e69 100644
      public boolean bt() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2704,6 +2721,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2533,6 +2550,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -313,7 +313,7 @@ index d3bcecb907..c07dfd7e69 100644
      public void l(float f) {}
  
      public boolean bA() {
-@@ -3555,4 +3573,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3378,4 +3396,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          void accept(Entity entity, double d0, double d1, double d2);
      }
@@ -1301,7 +1301,7 @@ index 77885f67ff..63f5969b10 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 206abf636a..136f6b9ec8 100644
+index af10fc36e0..e08b731d2c 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -1448,7 +1448,7 @@ index 206abf636a..136f6b9ec8 100644
                      if (this.bN != null) {
                          this.bN.b(this);
                      }
-@@ -951,7 +1026,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
+@@ -950,7 +1025,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
  
      @Override
      protected boolean n(Entity entity) {
@@ -2347,7 +2347,7 @@ index 81b7cd06f2..3e6722cfce 100644
          this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 27ef476001..240bbee360 100644
+index 1991cee43d..28218f048d 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2389,7 +2389,7 @@ index 27ef476001..240bbee360 100644
          super.o(f);
          this.r(f);
      }
-@@ -1089,7 +1088,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1082,7 +1081,7 @@ public abstract class EntityInsentient extends EntityLiving {
      }
  
      protected boolean a(EntityHuman entityhuman, EnumHand enumhand) {
@@ -2398,7 +2398,7 @@ index 27ef476001..240bbee360 100644
      }
  
      public boolean ec() {
-@@ -1388,4 +1387,39 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1381,4 +1380,39 @@ public abstract class EntityInsentient extends EntityLiving {
      public boolean a(Item item) {
          return this.getItemInMainHand().getItem() == item || this.getItemInOffHand().getItem() == item;
      }
@@ -2494,7 +2494,7 @@ index 7f6a567760..288a043fbd 100644
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 53f04c582a..88d4c7c71c 100644
+index ad474500e2..4049ab0273 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -75,7 +75,7 @@ public abstract class EntityLiving extends Entity {
@@ -3336,10 +3336,10 @@ index 0357c9da93..98a657cece 100644
          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 d49c45ce7f..cf37baee39 100644
+index e7bfbc3307..c64cc69f3d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1322,6 +1322,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1286,6 +1286,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      public void a(float f, float f1, boolean flag, boolean flag1) {
@@ -3347,7 +3347,7 @@ index d49c45ce7f..cf37baee39 100644
          if (this.isPassenger()) {
              if (f >= -1.0F && f <= 1.0F) {
                  this.aZ = f;
-@@ -1334,7 +1335,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1298,7 +1299,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.jumping = flag;
              this.setSneaking(flag1);
          }
@@ -4651,7 +4651,7 @@ index 1432d3f6bf..447387bd78 100644
          this.targetSelector.a(2, this.bz);
          this.targetSelector.a(3, this.bA);
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index bace6cf36a..151cb57028 100644
+index 8977c3516b..ad97fe7eaa 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -18,7 +18,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -5093,17 +5093,17 @@ index c4aa38ddf1..3d52a396e6 100644
          return f1 + f * (f2 - f1);
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 738c510706..2fddbb3ef1 100644
+index bdb90a3466..e059930ba7 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
-@@ -28,6 +28,7 @@ public abstract class PathfinderGoal {
+@@ -27,6 +27,7 @@ public abstract class PathfinderGoal {
  
      public void e() {}
  
 +    public void setTypes(EnumSet<PathfinderGoal.Type> types) { this.a(types); } // Purpur - OBFHELPER
      public void a(EnumSet<PathfinderGoal.Type> enumset) {
-         // Tuinity start - reduce garbage on heap
+         this.a.clear();
-         this.goalTypes.clear();
+         this.a.addAll(enumset);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
 index e07c7674a5..3c077b6870 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
@@ -5168,10 +5168,10 @@ 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 bc65942655..4069d47808 100644
+index 1131d43269..7451b7fc4b 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 {
+@@ -975,6 +975,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
      }
  
@@ -5179,7 +5179,7 @@ index bc65942655..4069d47808 100644
      public boolean a(AxisAlignedBB axisalignedbb, Material material) {
          int i = MathHelper.floor(axisalignedbb.minX);
          int j = MathHelper.f(axisalignedbb.maxX);
-@@ -1627,4 +1628,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1584,4 +1585,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      @Override public BiomeManager d() {
          return this.biomeManager;
      }
@@ -6291,10 +6291,10 @@ index 0000000000..6e50344c07
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 949acb1d32..a85ad3c512 100644
+index dfa15372b8..350aa67549 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1069,4 +1069,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1057,4 +1057,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().spawnReason;
      }
      // Paper end

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

@@ -1,4 +1,4 @@
-From a7d9029cef2ec6fec59e82889051368acc664950 Mon Sep 17 00:00:00 2001
+From 1f81122ea3f898adc0068b8723bb2136ab5cce2c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:52:12 -0500
 Subject: [PATCH] Logger settings (suppressing pointless logs)

patches/server/0009-Disable-outdated-build-check.patch

@@ -1,4 +1,4 @@
-From bafd106ba1a149db0f474c140401c741403f68b6 Mon Sep 17 00:00:00 2001
+From 610c69409a91f4e0ce7064b6de652df2375d81e9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Dec 2019 12:53:59 -0600
 Subject: [PATCH] Disable outdated build check
@@ -8,10 +8,10 @@ Subject: [PATCH] Disable outdated build check
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 7fc56f67fd..d1af8e9a92 100644
+index fc2c313901..7b7e1475b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -227,7 +227,7 @@ public class Main {
+@@ -220,7 +220,7 @@ public class Main {
                      System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  

patches/server/0010-Add-obfhelpers-for-plugin-use.patch

@@ -1,4 +1,4 @@
-From 32922b6b32b6694ebe0d1f69a021864d40bd7db0 Mon Sep 17 00:00:00 2001
+From 4a75af86103dd3fce42fcb75887c681e5474dc33 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Jan 2020 20:12:39 -0600
 Subject: [PATCH] Add obfhelpers for plugin use

patches/server/0011-Silk-touch-spawners.patch

@@ -1,4 +1,4 @@
-From ca711cf83f6e21f469d2ca3df58dcfbe7dd71dc7 Mon Sep 17 00:00:00 2001
+From fcf69dc9727e13cd05e36b1ccbb3bc9dea530efa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 14:27:37 -0500
 Subject: [PATCH] Silk touch spawners

patches/server/0012-Give-giants-AI.patch

@@ -1,4 +1,4 @@
-From 3bdfa2ee5b553f32da083b9420d71540409bab28 Mon Sep 17 00:00:00 2001
+From 8815a77a92f3c438d6a379f34307de09b536c87a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 00:43:12 -0500
 Subject: [PATCH] Give giants AI
@@ -78,10 +78,10 @@ index ff8a41a539..4296aaa074 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 240bbee360..3ef4f8db46 100644
+index 28218f048d..00cbd99914 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -874,6 +874,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -867,6 +867,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return f;
      }
  
@@ -89,7 +89,7 @@ index 240bbee360..3ef4f8db46 100644
      protected void a(DifficultyDamageScaler difficultydamagescaler) {
          if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
              int i = this.random.nextInt(2);
-@@ -981,6 +982,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -974,6 +975,7 @@ public abstract class EntityInsentient extends EntityLiving {
          }
      }
  

patches/server/0013-Illusioners-AI-settings.patch

@@ -1,4 +1,4 @@
-From 67ff8a43b84d1bbfd7ac8af7a088cb5e08d04dcb Mon Sep 17 00:00:00 2001
+From f69c078a136c8b4c90d46b19f5f0498fb94df06d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 11:09:25 -0500
 Subject: [PATCH] Illusioners AI settings

patches/server/0014-Zombie-horse-naturally-spawn.patch

@@ -1,4 +1,4 @@
-From 36ae1b2f8647646db83f34e9166df39faab626b5 Mon Sep 17 00:00:00 2001
+From 965318f23a523f848d1216d63c2680bb6580c655 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Zombie horse naturally spawn
@@ -9,10 +9,10 @@ Subject: [PATCH] Zombie horse naturally spawn
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9fc38244aa..ff7ea5bed6 100644
+index 2de48e7537..0a8f6ae30f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -922,12 +922,18 @@ public class WorldServer extends World {
+@@ -560,12 +560,18 @@ public class WorldServer extends World {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {

patches/server/0015-Charged-creeper-naturally-spawn.patch

@@ -1,4 +1,4 @@
-From 4aa3f2b108eb419de9510e2142bf4bf79d1a1a30 Mon Sep 17 00:00:00 2001
+From b193d1eae06da1137336b4beb8b8036af4b178ea Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:37:44 -0600
 Subject: [PATCH] Charged creeper naturally spawn

patches/server/0016-Rabbit-naturally-spawn-toast-and-killer.patch

@@ -1,4 +1,4 @@
-From dfba5d4730df31c059b0742500b783279083a145 Mon Sep 17 00:00:00 2001
+From 1926013fa1646f366b157e351060a28f9624385b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 31 Aug 2019 17:47:11 -0500
 Subject: [PATCH] Rabbit naturally spawn toast and killer

patches/server/0017-Cat-spawning-options.patch

@@ -1,4 +1,4 @@
-From 7775d7e381f2ad46b4bb1baf61d65f3162ff452f Mon Sep 17 00:00:00 2001
+From 975326f787697bfeca3d2629407771ec917523cf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 18:52:55 -0600
 Subject: [PATCH] Cat spawning options

patches/server/0018-Fix-non-black-cat-types-spawning-in-swamp-huts.patch

@@ -1,4 +1,4 @@
-From 2b0602f9ea4430b1733f36fb165cb26d0f46b9ad Mon Sep 17 00:00:00 2001
+From 61da90d5caa954016f81121175adcae46f5c5c98 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 01:23:22 -0600
 Subject: [PATCH] Fix non black cat types spawning in swamp huts

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

@@ -1,4 +1,4 @@
-From c449389b829d954ca4f717d3466e6d3d2241b46b Mon Sep 17 00:00:00 2001
+From f9bf73e2ad4c39eaba2194e3d0f70456d06cebe8 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 c07dfd7e69..e680d3c44a 100644
+index 0b9112c1b4..f81ab954e2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1208,6 +1208,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1038,6 +1038,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -22,7 +22,7 @@ index c07dfd7e69..e680d3c44a 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);
-@@ -2748,6 +2749,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2577,6 +2578,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
@@ -124,10 +124,10 @@ index 723a9fa1ee..f56fd7c012 100644
      public EntityCow createChild(EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a(this.world);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 88d4c7c71c..2b05a85b48 100644
+index 4049ab0273..47b19b7754 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2818,8 +2818,9 @@ public abstract class EntityLiving extends Entity {
+@@ -2812,8 +2812,9 @@ public abstract class EntityLiving extends Entity {
          this.aK = f;
      }
  

patches/server/0020-Fix-cow-rotation-when-shearing-mooshroom.patch

@@ -1,4 +1,4 @@
-From 6f98b0f4a463d451d6bdfb739607a3fc189b78f9 Mon Sep 17 00:00:00 2001
+From 1e6fed4c8ec31bc74507375d2da965338dcb24cb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:53:16 -0500
 Subject: [PATCH] Fix cow rotation when shearing mooshroom

patches/server/0021-Pigs-give-saddle-back.patch

@@ -1,4 +1,4 @@
-From 3cf0d17019dcae1a9ae231ea41cb10a7b6fbfaaa Mon Sep 17 00:00:00 2001
+From 6a5dac19f54fbfd76de115230a7b58c94a93f732 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 01:14:46 -0500
 Subject: [PATCH] Pigs give saddle back

patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch

@@ -1,4 +1,4 @@
-From fd7c18ec55b8ff36d2209cff1c2e08212630b1a3 Mon Sep 17 00:00:00 2001
+From dfcb225c82be95d7256af4e39310f060351a972a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 18 May 2019 16:59:52 -0500
 Subject: [PATCH] Phantoms do not spawn on creative players

patches/server/0023-Phantoms-only-attack-insomniacs.patch

@@ -1,4 +1,4 @@
-From fdc38d9e66b905b052caff62d0810ad74989f4fa Mon Sep 17 00:00:00 2001
+From 42e04689cfbb69dca93eb847bdd2f84d667f3623 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 20:33:41 -0600
 Subject: [PATCH] Phantoms only attack insomniacs

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

@@ -1,4 +1,4 @@
-From 619b7d8e5d67ee20769f45eebe47ea3323ec7f01 Mon Sep 17 00:00:00 2001
+From 112261ebf1719e21d66653658889e05f2f5b9bb1 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 e680d3c44a..1623b3faf5 100644
+index f81ab954e2..aa77bbed62 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1555,6 +1555,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1384,6 +1384,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -36,7 +36,7 @@ index e680d3c44a..1623b3faf5 100644
      public double h(Entity entity) {
          return this.c(entity.getPositionVector());
      }
-@@ -2078,14 +2079,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1907,14 +1908,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(new ItemStack(imaterial), (float) i);
      }
  
@@ -352,7 +352,7 @@ index cb5eed8785..580c48b34e 100644
  
              return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 2108923f5f..8ae3d37d7d 100644
+index 4157e50e4d..774ec96f0a 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -34,6 +34,7 @@ public interface IEntityAccess {

patches/server/0025-Snowman-drop-and-put-back-pumpkin.patch

@@ -1,4 +1,4 @@
-From 90f2892d4f52c6fdea92b79d33767eeb83b37f32 Mon Sep 17 00:00:00 2001
+From d48cf26f0e92496d4c60a9e846cd05b37af7aed8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:58:44 -0500
 Subject: [PATCH] Snowman drop and put back pumpkin

patches/server/0026-Ender-dragon-always-drop-egg.patch

@@ -1,4 +1,4 @@
-From 428b30a500d0e40c8748e2bcc3d2075e23b18741 Mon Sep 17 00:00:00 2001
+From dd9bb64c5e39f499d8016f1804c5f58dedc5e1a9 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

patches/server/0027-Ender-dragon-always-drop-full-exp.patch

@@ -1,4 +1,4 @@
-From f61594530387b460372417127c3afd3ecc467129 Mon Sep 17 00:00:00 2001
+From 5a776e9ce515dbe009d4062eb92937946b9e8568 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 24 Aug 2019 14:42:54 -0500
 Subject: [PATCH] Ender dragon always drop full exp
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop full exp
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 136f6b9ec8..06dedce18d 100644
+index e08b731d2c..baab056eff 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -641,7 +641,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {

patches/server/0028-Signs-editable-on-right-click.patch

@@ -1,4 +1,4 @@
-From 2a3cc64bf66f8728b7d8e826613ecdb77d33957f Mon Sep 17 00:00:00 2001
+From b5bc02a86c0e0a6e888e3a65ef1559a1d94c82a5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 24 May 2019 02:39:25 -0500
 Subject: [PATCH] Signs editable on right click

patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch

@@ -1,4 +1,4 @@
-From 40dce3660164737a4c72674ce56358a981aba14d Mon Sep 17 00:00:00 2001
+From 531799a2a2ac9ac2e708c1036ca2ea2f28de89f2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 4 Jun 2019 15:50:08 -0500
 Subject: [PATCH] Fix 'outdated server' showing in ping before server fully

patches/server/0030-Add-turtle-egg-block-options-fixes-MC-168772.patch

@@ -1,4 +1,4 @@
-From a96548d4bd61da1117fd783abc6a6dc5e5dcc7ea Mon Sep 17 00:00:00 2001
+From 8f423e9a0065d51e8b00cebd1d1425a721a835a2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] Add turtle egg block options - fixes MC-168772

patches/server/0031-Make-Iron-Golems-Swim.patch

@@ -1,4 +1,4 @@
-From 6a1013b967b978638a8c62c107cfb593e27ef5f8 Mon Sep 17 00:00:00 2001
+From 6e77b067283502e9f4d5064c2086974c5d7894a3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 15 Jun 2019 03:12:15 -0500
 Subject: [PATCH] Make Iron Golems Swim

patches/server/0032-Allow-soil-to-moisten-from-water-directly-under-it.patch

@@ -1,4 +1,4 @@
-From 492bb5a210f19b834f9c8839bbcd74bb382bbdbe Mon Sep 17 00:00:00 2001
+From 29f71d98c3ba415d64064c5acfa52a5376a3efc4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 21 Jun 2019 14:37:10 -0500
 Subject: [PATCH] Allow soil to moisten from water directly under it

patches/server/0033-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From b6bca5505339a781904390d62103ae378f35959d Mon Sep 17 00:00:00 2001
+From 5e5c5a45edec912c4df8a83027d0673f188202c6 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 1623b3faf5..51b2e745ef 100644
+index aa77bbed62..30bde05b84 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1455,6 +1455,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1285,6 +1285,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.inLava = true;
      }
  

patches/server/0034-Signs-allow-color-codes.patch

@@ -1,4 +1,4 @@
-From 537601232a9526aaf1a041995d8bd8a69090a6f0 Mon Sep 17 00:00:00 2001
+From 59a5bfd027b1573519cfc1be1242139806343d21 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Signs allow color codes
@@ -11,10 +11,10 @@ Subject: [PATCH] Signs allow color codes
  4 files changed, 25 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cf37baee39..561588ddaa 100644
+index c64cc69f3d..f9a574d115 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1162,6 +1162,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1126,6 +1126,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void openSign(TileEntitySign tileentitysign) {
          tileentitysign.a((EntityHuman) this);

patches/server/0035-Campfires-have-regen-effect.patch

@@ -1,4 +1,4 @@
-From 1d6c6b9ba8bb20d6671d129f2a85af98075ca63c Mon Sep 17 00:00:00 2001
+From 8995f846b274ea14dd1486c6f8f1ccf7fc3938d8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 19 May 2019 18:11:53 -0500
 Subject: [PATCH] Campfires have regen effect
@@ -25,10 +25,10 @@ index 6303be944c..65f8d803b8 100644
      public static final BlockStateDirection e = BlockProperties.N;
      private static final VoxelShape f = Block.a(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2b05a85b48..519b3499f6 100644
+index 47b19b7754..106fb5c027 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2778,10 +2778,19 @@ public abstract class EntityLiving extends Entity {
+@@ -2772,10 +2772,19 @@ public abstract class EntityLiving extends Entity {
      }
  
      public boolean hasLineOfSight(Entity entity) {

patches/server/0036-Disable-loot-drops-on-death-by-cramming.patch

@@ -1,4 +1,4 @@
-From 7e93b9b4f444561df55d15305d42ae0740b3f60b Mon Sep 17 00:00:00 2001
+From c3e420c80c3f9c5cd60e3427b907fa625154d4ae Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 3 Jul 2019 23:58:31 -0500
 Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
  2 files changed, 4 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 519b3499f6..6305b647dd 100644
+index 106fb5c027..0310e4ddd1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1374,8 +1374,10 @@ public abstract class EntityLiving extends Entity {

patches/server/0037-Campfires-burn-out-in-rain.patch

@@ -1,4 +1,4 @@
-From a59c3064035c3df486f874d3daedf5d22a5d7402 Mon Sep 17 00:00:00 2001
+From 32d7363527a4c8dce909e9d85aaf0e4c3fc36443 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 21:30:49 -0500
 Subject: [PATCH] Campfires burn out in rain

patches/server/0038-Campfires-should-fall-with-gravity.patch

@@ -1,4 +1,4 @@
-From 0c010ec5793c5892eff15df60f4828321572a275 Mon Sep 17 00:00:00 2001
+From d420003742cabe3f07be2233cdd78ad631fe8000 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 16:20:21 -0500
 Subject: [PATCH] Campfires should fall with gravity

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

@@ -1,4 +1,4 @@
-From 7c3c4905df7a9c229444538018d4fb6fc8a747de Mon Sep 17 00:00:00 2001
+From 7c36e3a59376a5f986e9ddde4819d7f4384938bf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets
@@ -10,10 +10,10 @@ Subject: [PATCH] Dont send useless entity packets
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 0323055c68..6449663b57 100644
+index 3a88c9a670..1f7c8f7da0 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-@@ -168,6 +168,7 @@ public class EntityTrackerEntry {
+@@ -162,6 +162,7 @@ public class EntityTrackerEntry {
                          this.o = 0;
                          packet1 = new PacketPlayOutEntityTeleport(this.tracker);
                      }
@@ -21,7 +21,7 @@ index 0323055c68..6449663b57 100644
                  }
  
                  if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) {
-@@ -254,6 +255,22 @@ public class EntityTrackerEntry {
+@@ -248,6 +249,22 @@ public class EntityTrackerEntry {
  
      }
  
@@ -41,9 +41,9 @@ index 0323055c68..6449663b57 100644
 +    }
 +    // Purpur end
 +
-     public final void onUntrack(EntityPlayer player) { this.a(player); } // Tuinity - OBFHELPER
      public void a(EntityPlayer entityplayer) {
          this.tracker.c(entityplayer);
+         entityplayer.c(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 index e5da2b19c1..5b1d959354 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java

patches/server/0040-Fix-item-position-desync-MC-4.patch

@@ -1,4 +1,4 @@
-From 9634dacfa4e2c9652b1c8daec2e1bb56128c6a03 Mon Sep 17 00:00:00 2001
+From d17719bc857035f9d86ddcc536857a01b0996aa8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] Fix item position desync (MC-4)
@@ -10,13 +10,13 @@ Subject: [PATCH] Fix item position desync (MC-4)
  3 files changed, 10 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 6449663b57..bc349c01dc 100644
+index 1f7c8f7da0..1589b46b75 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-@@ -130,6 +130,12 @@ public class EntityTrackerEntry {
+@@ -126,6 +126,12 @@ public class EntityTrackerEntry {
-                 double vec3d_dy = this.tracker.locY() - 2.44140625E-4D*(this.yLoc);
+                 j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F);
-                 double vec3d_dz = this.tracker.locZ() - 2.44140625E-4D*(this.zLoc);
+                 Vec3D vec3d = this.tracker.getPositionVector().d(PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc));
-                 boolean flag1 = (vec3d_dx * vec3d_dx + vec3d_dy * vec3d_dy + vec3d_dz * vec3d_dz) >= 7.62939453125E-6D;
+                 boolean flag1 = vec3d.g() >= 7.62939453125E-6D;
 +                // Purpur start - fixes MC-4
 +                if (net.pl3x.purpur.PurpurConfig.fixItemPositionDesync && this.tracker instanceof EntityItem) {
 +                    Vec3D loc = PacketPlayOutEntity.decrypt(PacketPlayOutEntity.encrypt(tracker.locX()), PacketPlayOutEntity.encrypt(tracker.locY()), PacketPlayOutEntity.encrypt(tracker.locZ()));

patches/server/0041-Fix-pig-zombies-MC-56653.patch

@@ -1,4 +1,4 @@
-From d0750ec9986f47d706ab554cfef2e71a2872a583 Mon Sep 17 00:00:00 2001
+From d371951ac40b0e5669ef9ac24e56aa6fb4aeae4c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] Fix pig zombies (MC-56653)

patches/server/0042-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 43d56e6918f00613c3080ba47d62b456d54bd0eb Mon Sep 17 00:00:00 2001
+From 4b71f0829824895383493e84d76408f49aaae863 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -37,10 +37,10 @@ index de22cad764..9d26bd1e4c 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 561588ddaa..b023a7b198 100644
+index f9a574d115..e4f948b8ae 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1653,8 +1653,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1617,8 +1617,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.cj = SystemUtils.getMonotonicMillis();
@@ -93,10 +93,10 @@ index 561588ddaa..b023a7b198 100644
          return this.serverStatisticManager;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 8ae3d37d7d..fa2f65a6d7 100644
+index 774ec96f0a..e474ae08a1 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
-@@ -130,28 +130,18 @@ public interface IEntityAccess {
+@@ -116,28 +116,18 @@ public interface IEntityAccess {
          return entityhuman;
      }
  
@@ -193,10 +193,10 @@ index 895e34ed34..f92516069a 100644
                                  if (from.getX() != Double.MAX_VALUE) {
                                      Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ff7ea5bed6..c48994f4b5 100644
+index 0a8f6ae30f..18f6aedc9c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -746,7 +746,7 @@ public class WorldServer extends World {
+@@ -383,7 +383,7 @@ public class WorldServer extends World {
          }
  
          if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -205,7 +205,7 @@ index ff7ea5bed6..c48994f4b5 100644
          })) {
              // CraftBukkit start
              long l = this.worldData.getDayTime() + 24000L;
-@@ -1050,7 +1050,7 @@ public class WorldServer extends World {
+@@ -688,7 +688,7 @@ public class WorldServer extends World {
              while (iterator.hasNext()) {
                  EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
@@ -237,10 +237,10 @@ index 84a89d7875..b454d71ac0 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b5ffd14413..f413d0a181 100644
+index 60f62f19cb..fa9fc940a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2125,4 +2125,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2092,4 +2092,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end
@@ -263,12 +263,12 @@ index b5ffd14413..f413d0a181 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index e160f03c1e..11fb146129 100644
+index 6e165a1649..da5fef091a 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -142,6 +142,7 @@ public class ActivationRange
+@@ -137,6 +137,7 @@ public class ActivationRange
-             final int maxRange = Math.min( ( ( player instanceof net.minecraft.server.EntityPlayer ? ((net.minecraft.server.EntityPlayer)player).getEffectiveViewDistance(((WorldServer)world).getChunkProvider().playerChunkMap) : world.spigotConfig.viewDistance ) << 4 ) - 8, maxRangeTemp );
+         {
-             // Tuinity end - per player view distance
+ 
              player.activatedTick = MinecraftServer.currentTick;
 +            if (!player.world.purpurConfig.idleTimeoutTickNearbyEntities && player.isAfk()) continue; // Purpur
              maxBB = player.getBoundingBox().grow( maxRange, 256, maxRange );

patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch

@@ -1,4 +1,4 @@
-From f513bd99c196359bba36154897149e3454782200 Mon Sep 17 00:00:00 2001
+From 64af6e51211c169c38e2e6c8312ab2c9edb90125 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 10 Jul 2019 20:43:05 -0500
 Subject: [PATCH] Option to toggle milk curing bad omen

patches/server/0044-Mending-mends-most-damages-equipment-first.patch

@@ -1,4 +1,4 @@
-From d66b7f10e158a98e6e39a3f849398ab2c7814e8f Mon Sep 17 00:00:00 2001
+From 126d0b582742e1c40bc865d4bf37e4a9bc88db9e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first

patches/server/0045-Tulips-change-fox-type.patch

@@ -1,4 +1,4 @@
-From 2ee51ebf1719ba365b215e4cda26e22aa2a2f017 Mon Sep 17 00:00:00 2001
+From 794914413f22901e9dff389b3b93b2912de134d2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type

patches/server/0046-Implement-a-hard-limit-for-pillager-outpost-spawns.patch

@@ -1,4 +1,4 @@
-From 9da683f7a8c8e92308212446af2816a735d4456e Mon Sep 17 00:00:00 2001
+From 7fbf6505b203b68f49f57a612ccc6fb21cb542c8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Implement a hard limit for pillager outpost spawns

patches/server/0047-Make-the-GUI-better.patch

@@ -1,4 +1,4 @@
-From ed5264e6626cae23ba0db29b618501f3375c9f46 Mon Sep 17 00:00:00 2001
+From ed688b405f0e6a047f5e3a087c7123056d834e9a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 16 Jan 2020 14:59:16 -0600
 Subject: [PATCH] Make the GUI better
@@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better
  create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8c7156bb52..14df148717 100644
+index d70c8cab2b..a8f3237ce1 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
@@ -69,7 +69,7 @@ index 8c7156bb52..14df148717 100644
                  new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
                  /*
                  jline.console.ConsoleReader bufferedreader = reader;
-@@ -421,7 +424,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -420,7 +423,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      @Override
      public void exit() {
          if (this.p != null) {
@@ -78,7 +78,7 @@ index 8c7156bb52..14df148717 100644
          }
  
          if (this.remoteControlListener != null) {
-@@ -520,7 +523,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -519,7 +522,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
      public void bc() {
          if (this.p == null) {
@@ -88,10 +88,10 @@ index 8c7156bb52..14df148717 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index af5dd9f2d3..f2a8af48df 100644
+index b31a9ac78c..f939f56d96 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1289,6 +1289,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1291,6 +1291,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return true;
      }
  

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

@@ -1,4 +1,4 @@
-From ef19b569e23b1f4731aec93d4489b9c116ba1889 Mon Sep 17 00:00:00 2001
+From f0535483f6f38c43d0935c869d511670516217f6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b023a7b198..7a8fa39493 100644
+index e4f948b8ae..d443df96e3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1136,7 +1136,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1100,7 +1100,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {

patches/server/0049-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From 85ecad4a65bc33e3ab3eca3a2fc16eb9483a802a Mon Sep 17 00:00:00 2001
+From 68532c826276e225fd345211a1f57b773c9e5c51 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 51b2e745ef..8d8dec2d1b 100644
+index 30bde05b84..fe6475cdcc 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 51b2e745ef..8d8dec2d1b 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2388,6 +2388,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2217,6 +2217,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 c48994f4b5..ff405cbb43 100644
+index 18f6aedc9c..368b4ea3a6 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/0050-Implement-elytra-settings.patch

@@ -1,4 +1,4 @@
-From d9c8753552395098a971ca38181e3f719743a74a Mon Sep 17 00:00:00 2001
+From 42c73917e959e85cbaf017f489bc90116046492d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings
@@ -13,7 +13,7 @@ Subject: [PATCH] Implement elytra settings
  6 files changed, 49 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6305b647dd..e9c5d39622 100644
+index 0310e4ddd1..e85a7526a2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2645,9 +2645,16 @@ public abstract class EntityLiving extends Entity {

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

@@ -1,4 +1,4 @@
-From 9960c7a877d58988dcf77c2aae1026c66c51d14f Mon Sep 17 00:00:00 2001
+From 86132ea883b70eadb9869c2f242a70dc624efd4c 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add tick times API
  2 files changed, 49 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f2a8af48df..0889cef15d 100644
+index f939f56d96..334ebae14f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -37,7 +37,7 @@ index f2a8af48df..0889cef15d 100644
          this.av = this.av * 0.8F + (float) l / 1000000.0F * 0.19999999F;
          long i1 = SystemUtils.getMonotonicNanos();
  
-@@ -2253,4 +2264,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -2255,4 +2266,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return SERVER; // Paper
      }
      // CraftBukkit end
@@ -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 811fe92e32..16da82abdb 100644
+index ea43602eb4..cea28154e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2236,4 +2236,16 @@ public final class CraftServer implements Server {
+@@ -2223,4 +2223,16 @@ public final class CraftServer implements Server {
          return net.minecraft.server.MinecraftServer.currentTick;
      }
      // Paper end

patches/server/0052-Add-blacklist-option-for-grindstone.patch

@@ -1,4 +1,4 @@
-From 61385327f6dc36309254875961d3aa950c3f66d8 Mon Sep 17 00:00:00 2001
+From 70f5a303345a54e3c7a95ec62d1e4112d028f5aa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 1 Aug 2019 19:15:12 -0500
 Subject: [PATCH] Add blacklist option for grindstone

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

@@ -1,4 +1,4 @@
-From f0005a30763b706451fb17b9b8de034ea701cdac Mon Sep 17 00:00:00 2001
+From 9406e3dd30db91cc126ff4399294e4798d8016ec 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
  3 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0889cef15d..2d7f1bae7a 100644
+index 334ebae14f..14d6f67c2b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -183,6 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -46,10 +46,10 @@ index 3670b4d48d..968d21dda4 100644
      public static boolean fixItemPositionDesync = false;
      private static void dontSendUselessEntityPackets() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 16da82abdb..393259e717 100644
+index cea28154e2..13da5fedbb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2247,5 +2247,10 @@ public final class CraftServer implements Server {
+@@ -2234,5 +2234,10 @@ public final class CraftServer implements Server {
      public double getAverageTickTime() {
          return getServer().tickTimes5s.getAverage();
      }

patches/server/0054-Implement-configurable-villager-brain-ticks.patch

@@ -1,4 +1,4 @@
-From 69283b5b511381b097d9840cbe13195b62ac62b6 Mon Sep 17 00:00:00 2001
+From 414761e8796f4a32c14ddadbd317b399572c2986 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks

patches/server/0055-Add-option-for-zombies-targetting-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From eef58ad830c673971d791318e5c483176eedd4d9 Mon Sep 17 00:00:00 2001
+From 5db9ce638c92c2c7c79202d54aa415a841a3cb07 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs

patches/server/0056-Implement-bamboo-growth-settings.patch

@@ -1,4 +1,4 @@
-From ab39daaa467a8644e58ecb54bc61298d7d6ebf75 Mon Sep 17 00:00:00 2001
+From 16b7461a4692820e86d06ee29c59b96661fc9089 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 20:57:29 -0500
 Subject: [PATCH] Implement bamboo growth settings

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

@@ -1,4 +1,4 @@
-From 98dad70d079fe940dbe3edf193b099cd15ed0a9a Mon Sep 17 00:00:00 2001
+From 71a54db095de1221364767de94bb2efd2efd0052 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] Climbing should not bypass cramming gamerule
@@ -17,10 +17,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
  10 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8d8dec2d1b..3905ad6cc4 100644
+index fe6475cdcc..f7a3eaa867 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1682,6 +1682,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1511,6 +1511,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isCollidable() {
@@ -47,7 +47,7 @@ index 8ad131e4fc..dfe8c57cef 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index dfc2ce9729..440c21355c 100644
+index 592408bac9..7a740f6768 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -85,7 +85,7 @@ public class EntityBat extends EntityAmbient {
@@ -86,19 +86,19 @@ index e7ba83f32a..55e18e4c7a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e9c5d39622..0590d2205d 100644
+index e85a7526a2..9f2b100735 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2679,7 +2679,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2673,7 +2673,7 @@ public abstract class EntityLiving extends Entity {
-             return;
+     protected void doTick() {}
-         }
+ 
-         // Tuinity - end don't run getEntities if we're not going to use its result
+     protected void collideNearby() {
 -        List<Entity> list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this));
 +        List<Entity> list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.pushable(this, world.purpurConfig.fixClimbingBypassingCrammingRule)); // Purpur
  
          if (!list.isEmpty()) {
-             // Tuinity - move up
+             int i = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING);
-@@ -2817,8 +2817,10 @@ public abstract class EntityLiving extends Entity {
+@@ -2811,8 +2811,10 @@ public abstract class EntityLiving extends Entity {
      }
  
      @Override

patches/server/0058-Option-for-slimes-not-pushable.patch

@@ -1,4 +1,4 @@
-From 8376418dc432cbb04eaaafd3096d62f15dbefe9f Mon Sep 17 00:00:00 2001
+From 4d2119c6af164fdd0de7954dedb4d166ce49b4a2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 21:56:31 -0500
 Subject: [PATCH] Option for slimes not pushable

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

@@ -1,4 +1,4 @@
-From 55fe56ffb3a2e13ba21c4ad2091968d6df1ea6a2 Mon Sep 17 00:00:00 2001
+From ad930c8b5a16e651cd4ec1c1729abccc5e4001d7 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 393259e717..3c534f50b8 100644
+index 13da5fedbb..e2392032b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2238,6 +2238,11 @@ public final class CraftServer implements Server {
+@@ -2225,6 +2225,11 @@ public final class CraftServer implements Server {
      // Paper end
  
      // Purpur start

patches/server/0060-Dispenser-curse-of-binding-protection.patch

@@ -1,4 +1,4 @@
-From 38cff44a61c275df29b12f24fca866fde6d98285 Mon Sep 17 00:00:00 2001
+From cc3dcdbfadcd5526822b30dea0ddcee347b4536f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection
@@ -10,10 +10,10 @@ Subject: [PATCH] Dispenser curse of binding protection
  3 files changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 3ef4f8db46..742745cb47 100644
+index 00cbd99914..66b4831949 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -920,6 +920,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -913,6 +913,13 @@ public abstract class EntityInsentient extends EntityLiving {
  
      }
  

patches/server/0061-Implement-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 38ff1f30f95b13a8a0436680bdf360c7d710faa1 Mon Sep 17 00:00:00 2001
+From 47b007e4714b79f6208b7c9e9fc4962f67abc93b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:45 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -38,7 +38,7 @@ index 55e18e4c7a..b14f67b3a3 100644
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0590d2205d..c23e62a646 100644
+index 9f2b100735..e43d0eb5a2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -125,6 +125,7 @@ public abstract class EntityLiving extends Entity {

patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch

@@ -1,4 +1,4 @@
-From 37cf14b03633e1ac7fffaa768a112ed9a0fec8d4 Mon Sep 17 00:00:00 2001
+From be01b85f112800b8af48a35a8ffe186a575ab8dd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 7 Sep 2019 22:47:59 -0500
 Subject: [PATCH] Add option for boats to eject players on land

patches/server/0063-Advancement-API-Additions.patch

@@ -1,4 +1,4 @@
-From 7985af538cbef17617f0aa410a6302cab9b593f8 Mon Sep 17 00:00:00 2001
+From 5e1b8093326605978ba1d9b32d9eaade834e22d1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:33 -0500
 Subject: [PATCH] Advancement API Additions

patches/server/0064-Add-option-to-set-armorstand-step-height.patch

@@ -1,4 +1,4 @@
-From 047ce45c2a0f0b749bd8a6b8705a1a7fe373b713 Mon Sep 17 00:00:00 2001
+From 18133fafa23a15460e7e6d0321b6a38eab265a25 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 6 Oct 2019 12:46:35 -0500
 Subject: [PATCH] Add option to set armorstand step height

patches/server/0065-Implement-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From 88ff88d5fbbe29441c5ef687f96d177706160b0f Mon Sep 17 00:00:00 2001
+From c7837842a925d7ae1c2d54edc830644ac6152c07 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:36:55 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg

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

@@ -1,4 +1,4 @@
-From 006fdc13e385c66e148fe21d81b3f67966a47bb5 Mon Sep 17 00:00:00 2001
+From 272fd9a3eca4cd104fb1ed6f59ab4970f62959bc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 11 Oct 2019 00:17:39 -0500
 Subject: [PATCH] Alternative Keepalive Handling

patches/server/0067-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From b8c04a8d56d6dabcb090b048f46caef2c08c5431 Mon Sep 17 00:00:00 2001
+From fc4736c0c89a383e896ebda33d2a68451191b011 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:00 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent