Tuinity! \o/

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

@@ -0,0 +1,61 @@
+From c666bb03ff971b242661f09f9df8a48efb1145db 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 Changes
+
+---
+ pom.xml                              | 12 ++++++------
+ src/main/java/org/bukkit/Server.java |  8 ++++++++
+ 2 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index dfc7c2f3..12a5e929 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -3,18 +3,18 @@
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+     <modelVersion>4.0.0</modelVersion>
+     <parent>
+-        <groupId>com.destroystokyo.paper</groupId>
+-        <artifactId>paper-parent</artifactId>
++        <groupId>com.tuinity</groupId>
++        <artifactId>tuinity-parent</artifactId>
+         <version>dev-SNAPSHOT</version>
++        <relativePath>../pom.xml</relativePath>
+     </parent>
+ 
+-    <groupId>com.destroystokyo.paper</groupId>
+-    <artifactId>paper-api</artifactId>
++    <artifactId>tuinity-api</artifactId>
+     <version>1.16.1-R0.1-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
+-    <name>Paper-API</name>
+-    <url>https://github.com/PaperMC/Paper</url>
++    <name>Tuinity-API</name>
++    <url>https://github.com/Spottedleaf/Tuinity</url>
+     <description>An enhanced plugin API for Minecraft servers.</description>
+ 
+     <properties>
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index b464cc1a..959e4e7e 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1424,6 +1424,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
+          *
+-- 
+2.26.2
+

patches/api/0002-Rebrand.patch

@@ -1,41 +1,41 @@
-From 236214ae05f55fc6ae1305edf2eb85b1bcc5af66 Mon Sep 17 00:00:00 2001
+From 6cabefe5ac062e259a8ae4edf0f85628593d36a9 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] Rebrand
 
 ---
- pom.xml | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
+ pom.xml | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index dfc7c2f35..cb2dea442 100644
+index 12a5e929..84c9870e 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3,18 +3,17 @@
+@@ -3,18 +3,18 @@
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
      <parent>
--        <groupId>com.destroystokyo.paper</groupId>
--        <artifactId>paper-parent</artifactId>
+-        <groupId>com.tuinity</groupId>
+-        <artifactId>tuinity-parent</artifactId>
 +        <groupId>net.pl3x.purpur</groupId>
 +        <artifactId>purpur-parent</artifactId>
          <version>dev-SNAPSHOT</version>
+         <relativePath>../pom.xml</relativePath>
      </parent>
  
--    <groupId>com.destroystokyo.paper</groupId>
--    <artifactId>paper-api</artifactId>
+-    <artifactId>tuinity-api</artifactId>
 +    <artifactId>purpur-api</artifactId>
      <version>1.16.1-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
--    <name>Paper-API</name>
--    <url>https://github.com/PaperMC/Paper</url>
+-    <name>Tuinity-API</name>
+-    <url>https://github.com/Spottedleaf/Tuinity</url>
 +    <name>Purpur-API</name>
 +    <url>https://github.com/pl3xgaming/Purpur</url>
      <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
-@@ -149,7 +148,7 @@
+@@ -149,7 +149,7 @@
      </dependencies>
  
      <build>

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

@@ -1,4 +1,4 @@
-From 207d7356ada158abb9151799b2c290cef7e465d0 Mon Sep 17 00:00:00 2001
+From 51909d1294b8a427c02ab0edac37205069b58d78 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
@@ -8,12 +8,12 @@ Subject: [PATCH] Purpur config files
  1 file changed, 12 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b464cc1a7..1a05a438c 100644
+index 959e4e7e..a5262420 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1424,6 +1424,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1432,6 +1432,18 @@ public interface Server extends PluginMessageRecipient {
          }
-         // Paper end
+         // Tuinity end - add config to timings report
  
 +        // Purpur start
 +        @NotNull

patches/api/0004-Default-permissions.patch

@@ -1,4 +1,4 @@
-From 77cf864ad36201a94e3c8ac0535064c98e5c175a Mon Sep 17 00:00:00 2001
+From 0105b33898fbefac968bac777201e745d11bdb73 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 Jun 2020 23:32:38 -0500
 Subject: [PATCH] Default permissions
@@ -11,7 +11,7 @@ Subject: [PATCH] Default permissions
  create mode 100644 src/main/java/org/bukkit/util/permissions/PurpurPermissions.java
 
 diff --git a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
-index 7763d6101..d5a42707d 100644
+index 7763d610..d5a42707 100644
 --- a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
 +++ b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
 @@ -18,6 +18,7 @@ public final class CommandPermissions {
@@ -23,7 +23,7 @@ index 7763d6101..d5a42707d 100644
          commands.recalculatePermissibles();
          return commands;
 diff --git a/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java b/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
-index e1a4ddf2c..8e481e381 100644
+index e1a4ddf2..8e481e38 100644
 --- a/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
 +++ b/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
 @@ -89,6 +89,8 @@ public final class DefaultPermissions {
@@ -37,7 +37,7 @@ index e1a4ddf2c..8e481e381 100644
  }
 diff --git a/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java
 new file mode 100644
-index 000000000..14cb78e3e
+index 00000000..14cb78e3
 --- /dev/null
 +++ b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java
 @@ -0,0 +1,69 @@

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

@@ -1,4 +1,4 @@
-From 683682367df0d1ec0605b5d75398d9a3f096ca2a Mon Sep 17 00:00:00 2001
+From 71daaa052b59b70bfdf1d26a1fc7eb85aceda055 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Allow inventory resizing
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index b59fec1ae..e3b77f565 100644
+index b59fec1a..e3b77f56 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
 @@ -132,7 +132,7 @@ public enum InventoryType {

patches/api/0006-Advancement-API.patch

@@ -1,4 +1,4 @@
-From c43598530aeb734560bda5aa9e33ba4ecc18ed2a Mon Sep 17 00:00:00 2001
+From 187dbb6bb7a7a564c79b2db678c2fd5d9f32d964 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
@@ -12,7 +12,7 @@ Subject: [PATCH] Advancement API
  create mode 100644 src/main/java/org/bukkit/advancement/FrameType.java
 
 diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java
-index 7c5009974..432caadba 100644
+index 7c500997..432caadb 100644
 --- a/src/main/java/org/bukkit/advancement/Advancement.java
 +++ b/src/main/java/org/bukkit/advancement/Advancement.java
 @@ -3,6 +3,7 @@ package org.bukkit.advancement;
@@ -38,7 +38,7 @@ index 7c5009974..432caadba 100644
  }
 diff --git a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
 new file mode 100644
-index 000000000..bca3d112e
+index 00000000..bca3d112
 --- /dev/null
 +++ b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
 @@ -0,0 +1,53 @@
@@ -97,7 +97,7 @@ index 000000000..bca3d112e
 +}
 diff --git a/src/main/java/org/bukkit/advancement/FrameType.java b/src/main/java/org/bukkit/advancement/FrameType.java
 new file mode 100644
-index 000000000..d1757f3d4
+index 00000000..d1757f3d
 --- /dev/null
 +++ b/src/main/java/org/bukkit/advancement/FrameType.java
 @@ -0,0 +1,27 @@

patches/api/0007-Llama-API.patch

@@ -1,4 +1,4 @@
-From 3efaae899100095ab241d17882103707e439d625 Mon Sep 17 00:00:00 2001
+From 6218971b943e4ead4f80712c59d44efb80c0511e 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] Llama API
@@ -13,7 +13,7 @@ Subject: [PATCH] Llama API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
 new file mode 100644
-index 000000000..6e68c1399
+index 00000000..6e68c139
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
 @@ -0,0 +1,61 @@
@@ -80,7 +80,7 @@ index 000000000..6e68c1399
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
 new file mode 100644
-index 000000000..ec8d978c2
+index 00000000..ec8d978c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
 @@ -0,0 +1,34 @@
@@ -119,7 +119,7 @@ index 000000000..ec8d978c2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index d23226ccb..1ef9479c9 100644
+index d23226cc..1ef9479c 100644
 --- a/src/main/java/org/bukkit/entity/Llama.java
 +++ b/src/main/java/org/bukkit/entity/Llama.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;

patches/api/0008-Evoker-API.patch

@@ -1,4 +1,4 @@
-From bbc865bdfdd716cc526fbd7cc57e6eb0841d9926 Mon Sep 17 00:00:00 2001
+From 5f09e991c9555ba836ee891e52acd6881040d345 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] Evoker API
@@ -8,7 +8,7 @@ Subject: [PATCH] Evoker API
  1 file changed, 17 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Evoker.java b/src/main/java/org/bukkit/entity/Evoker.java
-index f8d173adc..f2a03f7f8 100644
+index f8d173ad..f2a03f7f 100644
 --- a/src/main/java/org/bukkit/entity/Evoker.java
 +++ b/src/main/java/org/bukkit/entity/Evoker.java
 @@ -64,4 +64,21 @@ public interface Evoker extends Spellcaster {

patches/api/0009-AFK-API.patch

@@ -1,4 +1,4 @@
-From b01aba9c3138bfcde84036b1fbed0ec910617913 Mon Sep 17 00:00:00 2001
+From 7fa4a397d97e8bac99b3eed5d995d6696d820ebe 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] AFK API
@@ -11,7 +11,7 @@ Subject: [PATCH] AFK API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 new file mode 100644
-index 000000000..0c8b3e5e4
+index 00000000..0c8b3e5e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 000000000..0c8b3e5e4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2eb312138..2dca16ac4 100644
+index 2eb31213..2dca16ac 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1870,4 +1870,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -1,4 +1,4 @@
-From 964c8bd13a95dd17362e4c9bf98acc1a7662e008 Mon Sep 17 00:00:00 2001
+From 2c69dbc2a73e148723a2011c2b78006ee23e97ae Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:18:40 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 20 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 329e2dd1c..4f6f01939 100644
+index 329e2dd1..4f6f0193 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1749,4 +1749,15 @@ public final class Bukkit {
@@ -29,10 +29,10 @@ index 329e2dd1c..4f6f01939 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1a05a438c..c8b50ec90 100644
+index a5262420..e3808a79 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1536,4 +1536,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1544,4 +1544,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
      // Paper end

patches/api/0011-ExecuteCommandEvent.patch

@@ -1,4 +1,4 @@
-From c9d8ecde06f4f694ed59d1da743b79b003a55b3c Mon Sep 17 00:00:00 2001
+From 7168d5182318a5a5c35f20bddaf992ecea957763 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] ExecuteCommandEvent
@@ -11,7 +11,7 @@ Subject: [PATCH] ExecuteCommandEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java
 new file mode 100644
-index 000000000..3250bd4dc
+index 00000000..3250bd4d
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java
 @@ -0,0 +1,130 @@
@@ -146,7 +146,7 @@ index 000000000..3250bd4dc
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 460fda05a..1e0eb0999 100644
+index 460fda05..1e0eb099 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -147,6 +147,19 @@ public class SimpleCommandMap implements CommandMap {

patches/api/0012-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 6e3bdc06356d7b63bb206d7319badf594e30d872 Mon Sep 17 00:00:00 2001
+From 148b37f8d2e62b7075b27b0d36dd0470b460e142 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] LivingEntity safeFallDistance
@@ -8,7 +8,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
  1 file changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a60523cc9..5b688cd04 100644
+index a60523cc..5b688cd0 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -753,4 +753,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0013-MoonPhase-API.patch

@@ -1,4 +1,4 @@
-From 28381a87dfb15e899df91a30192d98eb2575dff8 Mon Sep 17 00:00:00 2001
+From 429414ef1d9773c1df37641278660e4a68dea10f 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] MoonPhase API
@@ -11,7 +11,7 @@ Subject: [PATCH] MoonPhase API
 
 diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java
 new file mode 100644
-index 000000000..f5ad98c62
+index 00000000..f5ad98c6
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
 @@ -0,0 +1,36 @@
@@ -52,7 +52,7 @@ index 000000000..f5ad98c62
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 75c9225bd..9955d7417 100644
+index 75c9225b..9955d741 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -3450,6 +3450,16 @@ public interface World extends PluginMessageRecipient, Metadatable {

patches/api/0014-Lagging-threshold.patch

@@ -1,4 +1,4 @@
-From cc7269c63a9bf44a2ddf6d3e51d3d665d265f271 Mon Sep 17 00:00:00 2001
+From fadc3e9707dd05213bf119aba6d4604696729896 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] Lagging threshold
@@ -9,7 +9,7 @@ Subject: [PATCH] Lagging threshold
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4f6f01939..4c410f6e1 100644
+index 4f6f0193..4c410f6e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1759,5 +1759,14 @@ public final class Bukkit {
@@ -28,10 +28,10 @@ index 4f6f01939..4c410f6e1 100644
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c8b50ec90..dc6201365 100644
+index e3808a79..d8c81767 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1544,5 +1544,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1552,5 +1552,12 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      String getServerName();

patches/api/0015-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From 3414a3777cd50ba9f807ed0f83284f7dd88e0137 Mon Sep 17 00:00:00 2001
+From 6a8e9699b7a8d5a40f88f01f62670fd9b74a7b7e 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] ItemFactory#getMonsterEgg
@@ -8,7 +8,7 @@ Subject: [PATCH] ItemFactory#getMonsterEgg
  1 file changed, 11 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 03ba22659..630c15d23 100644
+index 03ba2265..630c15d2 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -166,4 +166,15 @@ public interface ItemFactory {

patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From 793caade58c03633ae3b36b59ced116586950df6 Mon Sep 17 00:00:00 2001
+From 192ebbf530a67ed5a3d0baed103708f95e9aa39f 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] PlayerSetSpawnerTypeWithEggEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 new file mode 100644
-index 000000000..c050b75e9
+index 00000000..c050b75e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 @@ -0,0 +1,85 @@

patches/api/0017-EMC-MonsterEggSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 6f446935210fd7f4676937654457d8d6c1faf2ca Mon Sep 17 00:00:00 2001
+From a9021d0f56cb27f4532c44e3ce8400bfad8563a7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 21 Nov 2016 17:02:11 -0500
 Subject: [PATCH] EMC - MonsterEggSpawnEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 new file mode 100644
-index 000000000..983d67234
+index 00000000..983d6723
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 @@ -0,0 +1,67 @@

patches/api/0018-Villager-resetOffers.patch

@@ -1,4 +1,4 @@
-From 49323476e3d0ca119769a379c1080de43ebd3981 Mon Sep 17 00:00:00 2001
+From 70a13007f8475a226590df7dcd9fdd6c2060de1e 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] Villager#resetOffers
@@ -8,7 +8,7 @@ Subject: [PATCH] Villager#resetOffers
  1 file changed, 7 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index c8777a476..ed703af45 100644
+index c8777a47..ed703af4 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {

patches/api/0019-World-getPlacementBlockData.patch

@@ -1,4 +1,4 @@
-From f7b6857340ba29d5877523fa69ad968247143ae7 Mon Sep 17 00:00:00 2001
+From 8eb0a3b8e8fb7dfaef23c02f6f3ce2183461047c 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] World#getPlacementBlockData
@@ -8,7 +8,7 @@ Subject: [PATCH] World#getPlacementBlockData
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9955d7417..950425979 100644
+index 9955d741..95042597 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -3458,6 +3458,16 @@ public interface World extends PluginMessageRecipient, Metadatable {

patches/api/0020-LivingEntity-playPickupItemAnimation.patch

@@ -1,4 +1,4 @@
-From ee3249840f9b53b10d7df7434088c5be3a1cd1ea Mon Sep 17 00:00:00 2001
+From d5561b9fc5626a9d263d12145c58eb2f39a4bcca 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] LivingEntity#playPickupItemAnimation
@@ -8,7 +8,7 @@ Subject: [PATCH] LivingEntity#playPickupItemAnimation
  1 file changed, 17 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5b688cd04..a0db76946 100644
+index 5b688cd0..a0db7694 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -768,5 +768,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0021-SkeletonHorseTrapEvent-getPlayer.patch

@@ -1,4 +1,4 @@
-From 9dc21420ed45e161850891442fb6f6ab988eb2e8 Mon Sep 17 00:00:00 2001
+From b9d3e5804fc24259bf59943ac14de4a3416a4856 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] SkeletonHorseTrapEvent#getPlayer
@@ -8,7 +8,7 @@ Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer
  1 file changed, 24 insertions(+)
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-index d79dbcd68..1ed3ea8fa 100644
+index d79dbcd6..1ed3ea8f 100644
 --- a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 @@ -1,20 +1,30 @@

patches/api/0022-PaperPR-PlayerItemCooldownEvent.patch

@@ -1,4 +1,4 @@
-From 585d46d0b381d2dd334997acf9140f505b484bfe Mon Sep 17 00:00:00 2001
+From 855fc3bdef2953107a8e75a953c086a7866eb024 Mon Sep 17 00:00:00 2001
 From: KennyTV <kennytv@t-online.de>
 Date: Mon, 20 Apr 2020 13:57:13 +0200
 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 new file mode 100644
-index 000000000..2002909f3
+index 00000000..2002909f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 @@ -0,0 +1,77 @@

patches/api/0023-EntityMoveEvent.patch

@@ -1,4 +1,4 @@
-From e15332baaee66fbb5134bc7891a9ba0890d24e04 Mon Sep 17 00:00:00 2001
+From 9c6e4fddc16253233e0cca1d093e76d8c4ac64a9 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] EntityMoveEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] EntityMoveEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 new file mode 100644
-index 000000000..c48c525b8
+index 00000000..c48c525b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 @@ -0,0 +1,95 @@

patches/api/0024-PaperPR-BellRingEvent.patch

@@ -1,4 +1,4 @@
-From b9e5c3e951fb47294a74c6515e6c3f5442a8b8e7 Mon Sep 17 00:00:00 2001
+From 13467a78b38df42ecee499849c1bf9ceb914bfdf Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:39 -0700
 Subject: [PATCH] PaperPR - BellRingEvent
@@ -12,7 +12,7 @@ village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java
 new file mode 100644
-index 000000000..82e0a747b
+index 00000000..82e0a747
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java
 @@ -0,0 +1,53 @@

patches/api/0025-Player-invulnerabilities.patch

@@ -1,4 +1,4 @@
-From be009f6bd10975040ad8ff9378eca1569132774b Mon Sep 17 00:00:00 2001
+From 471dd5a530419f3dc9af3601d37ef3f2957291c5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 2 May 2020 20:55:31 -0500
 Subject: [PATCH] Player invulnerabilities
@@ -8,7 +8,7 @@ Subject: [PATCH] Player invulnerabilities
  1 file changed, 21 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2dca16ac4..55edcd54b 100644
+index 2dca16ac..55edcd54 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1890,5 +1890,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0026-Anvil-API.patch

@@ -1,4 +1,4 @@
-From 4b4840812bcfe1331263157f9b7b61ec8d79e672 Mon Sep 17 00:00:00 2001
+From 2e6244aec6bbbb3846c4ba2c59998c44e605ace9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 19 Apr 2020 00:25:09 -0500
 Subject: [PATCH] Anvil API
@@ -13,7 +13,7 @@ Subject: [PATCH] Anvil API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 new file mode 100644
-index 000000000..85663c0a4
+index 00000000..85663c0a
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 @@ -0,0 +1,52 @@
@@ -71,7 +71,7 @@ index 000000000..85663c0a4
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 new file mode 100644
-index 000000000..2717ad82c
+index 00000000..2717ad82
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 @@ -0,0 +1,35 @@
@@ -111,7 +111,7 @@ index 000000000..2717ad82c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-index b95e563b5..435026e53 100644
+index b95e563b..435026e5 100644
 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
 +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
 @@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {

patches/api/0027-ItemStack-convenience-methods.patch

@@ -1,4 +1,4 @@
-From dc446f6d6e36a6b06f04d8395835257126454d27 Mon Sep 17 00:00:00 2001
+From 90d4f270ec4296b0f0c013e8d3a97a5c4babe79a 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] ItemStack convenience methods
@@ -9,7 +9,7 @@ Subject: [PATCH] ItemStack convenience methods
  2 files changed, 651 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 769c65e79..7126e5cba 100644
+index 3a8438fb..e7167d11 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -8636,4 +8636,36 @@ public enum Material implements Keyed {
@@ -50,7 +50,7 @@ index 769c65e79..7126e5cba 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ccd81fca2..c38fd8403 100644
+index ccd81fca..c38fd840 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/0028-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -1,4 +1,4 @@
-From 19065eff8026e396d1bf06bc2f87e7598c322c25 Mon Sep 17 00:00:00 2001
+From 20a60758768a69b9083d1c079b15571860979291 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 28 Jun 2020 21:50:55 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -8,7 +8,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
  1 file changed, 4 insertions(+)
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index d7f1b2c84..8d25b6f09 100644
+index d7f1b2c8..8d25b6f0 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -205,4 +205,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {