Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly Paper Changes: fcbeac8a [CI-SKIP] Readme update (#3702) 824f8086 Bandaid italic legacy serialization #3757 (#3760) Tuinity Changes: 9f21359: Re-add optimise collision checking in player move packet handling 1152054: Revert player move packet optimisation ef0a6c4: Optimise collision checking in player move packets
2026-02-19 01:17:42 +01:00 · 2020-07-02 20:37:57 -05:00
parent 140a58f451
commit 5c7cdad371
127 changed files with 178 additions and 1200 deletions
--- a/patches/api/0001-Tuinity-API-Changes.patch
+++ b/patches/api/0001-Tuinity-API-Changes.patch
@@ -1,12 +1,8 @@
-From c666bb03ff971b242661f09f9df8a48efb1145db Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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
@@ -56,6 +52,3 @@ index b464cc1a..959e4e7e 100644
         /**
          * Sends the component to the player
          *
-- 
-2.26.2
-
--- a/patches/api/0002-Rebrand.patch
+++ b/patches/api/0002-Rebrand.patch
@@ -1,11 +1,8 @@
-From 6cabefe5ac062e259a8ae4edf0f85628593d36a9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)

 diff --git a/pom.xml b/pom.xml
 index 12a5e929..84c9870e 100644
@@ -44,6 +41,3 @@ index 12a5e929..84c9870e 100644
         <plugins>
             <plugin>
                 <groupId>net.md-5</groupId>
-- 
-2.26.2
-
--- a/patches/api/0003-Purpur-config-files.patch
+++ b/patches/api/0003-Purpur-config-files.patch
@@ -1,11 +1,8 @@
-From 51909d1294b8a427c02ab0edac37205069b58d78 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/Server.java | 12 ++++++++++++
- 1 file changed, 12 insertions(+)

 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
 index 959e4e7e..a5262420 100644
@@ -30,6 +27,3 @@ index 959e4e7e..a5262420 100644
         /**
          * Sends the component to the player
          *
-- 
-2.26.2
-
--- a/patches/api/0004-Default-permissions.patch
+++ b/patches/api/0004-Default-permissions.patch
@@ -1,14 +1,8 @@
-From 0105b33898fbefac968bac777201e745d11bdb73 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../util/permissions/CommandPermissions.java  |  1 +
- .../util/permissions/DefaultPermissions.java  |  2 +
- .../util/permissions/PurpurPermissions.java   | 69 +++++++++++++++++++
- 3 files changed, 72 insertions(+)
- 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 7763d610..d5a42707 100644
@@ -110,6 +104,3 @@ index 00000000..14cb78e3
 +        return purpur;
 +    }
 +}
-- 
-2.26.2
-
--- a/patches/api/0005-Allow-inventory-resizing.patch
+++ b/patches/api/0005-Allow-inventory-resizing.patch
@@ -1,11 +1,8 @@
-From 71daaa052b59b70bfdf1d26a1fc7eb85aceda055 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../java/org/bukkit/event/inventory/InventoryType.java    | 8 +++++++-
- 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 b59fec1a..e3b77f56 100644
@@ -33,6 +30,3 @@ index b59fec1a..e3b77f56 100644
     public int getDefaultSize() {
         return size;
     }
-- 
-2.26.2
-
--- a/patches/api/0006-Advancement-API.patch
+++ b/patches/api/0006-Advancement-API.patch
@@ -1,15 +1,8 @@
-From 187dbb6bb7a7a564c79b2db678c2fd5d9f32d964 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../org/bukkit/advancement/Advancement.java   |  9 ++++
- .../advancement/AdvancementDisplay.java       | 53 +++++++++++++++++++
- .../org/bukkit/advancement/FrameType.java     | 27 ++++++++++
- 3 files changed, 89 insertions(+)
- create mode 100644 src/main/java/org/bukkit/advancement/AdvancementDisplay.java
- 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 7c500997..432caadb 100644
@@ -128,6 +121,3 @@ index 00000000..d1757f3d
 +        return "FrameType[name=" + name() + ",color=" + color + "]";
 +    }
 +}
-- 
-2.26.2
-
--- a/patches/api/0007-Llama-API.patch
+++ b/patches/api/0007-Llama-API.patch
@@ -1,15 +1,8 @@
-From 6218971b943e4ead4f80712c59d44efb80c0511e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../event/entity/LlamaJoinCaravanEvent.java   | 61 ++++++++++++++++++
- .../event/entity/LlamaLeaveCaravanEvent.java  | 34 ++++++++++
- src/main/java/org/bukkit/entity/Llama.java    | 62 +++++++++++++++++++
- 3 files changed, 157 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
- create mode 100644 src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java

 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
@@ -196,6 +189,3 @@ index d23226cc..1ef9479c 100644
 +    Llama getCaravanTail();
 +    // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0008-Evoker-API.patch
+++ b/patches/api/0008-Evoker-API.patch
@@ -1,11 +1,8 @@
-From 5f09e991c9555ba836ee891e52acd6881040d345 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/entity/Evoker.java | 17 +++++++++++++++++
- 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 f8d173ad..f2a03f7f 100644
@@ -33,6 +30,3 @@ index f8d173ad..f2a03f7f 100644
 +    void setWololoTarget(@Nullable Sheep sheep);
 +    // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0009-AFK-API.patch
+++ b/patches/api/0009-AFK-API.patch
@@ -1,13 +1,8 @@
-From 7fa4a397d97e8bac99b3eed5d995d6696d820ebe Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../net/pl3x/purpur/event/PlayerAFKEvent.java | 70 +++++++++++++++++++
- src/main/java/org/bukkit/entity/Player.java   | 21 ++++++
- 2 files changed, 91 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java

 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
@@ -115,6 +110,3 @@ index 2eb31213..2dca16ac 100644
 +    void resetIdleTimer();
 +    // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0010-Bring-back-server-name.patch
+++ b/patches/api/0010-Bring-back-server-name.patch
@@ -1,12 +1,8 @@
-From 2c69dbc2a73e148723a2011c2b78006ee23e97ae Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/Bukkit.java | 11 +++++++++++
- src/main/java/org/bukkit/Server.java |  9 +++++++++
- 2 files changed, 20 insertions(+)

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
 index 329e2dd1..4f6f0193 100644
@@ -46,6 +42,3 @@ index a5262420..e3808a79 100644
 +    String getServerName();
 +    // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0011-ExecuteCommandEvent.patch
+++ b/patches/api/0011-ExecuteCommandEvent.patch
@@ -1,13 +1,8 @@
-From 7168d5182318a5a5c35f20bddaf992ecea957763 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../purpur/event/ExecuteCommandEvent.java     | 130 ++++++++++++++++++
- .../org/bukkit/command/SimpleCommandMap.java  |  15 +-
- 2 files changed, 144 insertions(+), 1 deletion(-)
- create mode 100644 src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java

 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
@@ -178,6 +173,3 @@ index 460fda05..1e0eb099 100644
             } // target.timings.stopTiming(); // Spigot // Paper
         } catch (CommandException ex) {
             server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper
-- 
-2.26.2
-
--- a/patches/api/0012-LivingEntity-safeFallDistance.patch
+++ b/patches/api/0012-LivingEntity-safeFallDistance.patch
@@ -1,11 +1,8 @@
-From 148b37f8d2e62b7075b27b0d36dd0470b460e142 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../java/org/bukkit/entity/LivingEntity.java     | 16 ++++++++++++++++
- 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 a60523cc..5b688cd0 100644
@@ -32,6 +29,3 @@ index a60523cc..5b688cd0 100644
 +    void setSafeFallDistance(float safeFallDistance);
 +    // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0013-MoonPhase-API.patch
+++ b/patches/api/0013-MoonPhase-API.patch
@@ -1,13 +1,8 @@
-From 429414ef1d9773c1df37641278660e4a68dea10f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/net/pl3x/purpur/MoonPhase.java | 36 ++++++++++++++++++++
- src/main/java/org/bukkit/World.java          | 10 ++++++
- 2 files changed, 46 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/MoonPhase.java

 diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java
 new file mode 100644
@@ -72,6 +67,3 @@ index 75c9225b..9955d741 100644
     /**
      * Get the {@link DragonBattle} associated with this world.
      *
-- 
-2.26.2
-
--- a/patches/api/0014-Lagging-threshold.patch
+++ b/patches/api/0014-Lagging-threshold.patch
@@ -1,12 +1,8 @@
-From fadc3e9707dd05213bf119aba6d4604696729896 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/Bukkit.java | 9 +++++++++
- src/main/java/org/bukkit/Server.java | 7 +++++++
- 2 files changed, 16 insertions(+)

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
 index 4f6f0193..4c410f6e 100644
@@ -44,6 +40,3 @@ index e3808a79..d8c81767 100644
 +    boolean isLagging();
     // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0015-ItemFactory-getMonsterEgg.patch
+++ b/patches/api/0015-ItemFactory-getMonsterEgg.patch
@@ -1,11 +1,8 @@
-From 6a8e9699b7a8d5a40f88f01f62670fd9b74a7b7e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/inventory/ItemFactory.java | 11 +++++++++++
- 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 03ba2265..630c15d2 100644
@@ -27,6 +24,3 @@ index 03ba2265..630c15d2 100644
 +    ItemStack getMonsterEgg(@Nullable org.bukkit.entity.EntityType type);
 +    // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,12 +1,8 @@
-From 192ebbf530a67ed5a3d0baed103708f95e9aa39f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../PlayerSetSpawnerTypeWithEggEvent.java     | 85 +++++++++++++++++++
- 1 file changed, 85 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java

 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
@@ -99,6 +95,3 @@ index 00000000..c050b75e
 +        return handlers;
 +    }
 +}
-- 
-2.26.2
-
--- a/patches/api/0017-EMC-MonsterEggSpawnEvent.patch
+++ b/patches/api/0017-EMC-MonsterEggSpawnEvent.patch
@@ -1,12 +1,8 @@
-From a9021d0f56cb27f4532c44e3ce8400bfad8563a7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../event/entity/MonsterEggSpawnEvent.java    | 67 +++++++++++++++++++
- 1 file changed, 67 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java

 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
@@ -81,6 +77,3 @@ index 00000000..983d6723
 +        return handlers;
 +    }
 +}
-- 
-2.26.2
-
--- a/patches/api/0018-Villager-resetOffers.patch
+++ b/patches/api/0018-Villager-resetOffers.patch
@@ -1,11 +1,8 @@
-From 70a13007f8475a226590df7dcd9fdd6c2060de1e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/entity/Villager.java | 7 +++++++
- 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 c8777a47..ed703af4 100644
@@ -25,6 +22,3 @@ index c8777a47..ed703af4 100644
     /**
      * Represents Villager type, usually corresponding to what biome they spawn
      * in.
-- 
-2.26.2
-
--- a/patches/api/0019-World-getPlacementBlockData.patch
+++ b/patches/api/0019-World-getPlacementBlockData.patch
@@ -1,11 +1,8 @@
-From 8eb0a3b8e8fb7dfaef23c02f6f3ce2183461047c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/World.java | 10 ++++++++++
- 1 file changed, 10 insertions(+)

 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
 index 9955d741..95042597 100644
@@ -28,6 +25,3 @@ index 9955d741..95042597 100644
     // Purpur end
 
     /**
-- 
-2.26.2
-
--- a/patches/api/0020-LivingEntity-playPickupItemAnimation.patch
+++ b/patches/api/0020-LivingEntity-playPickupItemAnimation.patch
@@ -1,11 +1,8 @@
-From d5561b9fc5626a9d263d12145c58eb2f39a4bcca Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../java/org/bukkit/entity/LivingEntity.java    | 17 +++++++++++++++++
- 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 5b688cd0..a0db7694 100644
@@ -34,6 +31,3 @@ index 5b688cd0..a0db7694 100644
 +    void playPickupItemAnimation(@NotNull Item item, int quantity);
     // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0021-SkeletonHorseTrapEvent-getPlayer.patch
+++ b/patches/api/0021-SkeletonHorseTrapEvent-getPlayer.patch
@@ -1,11 +1,8 @@
-From b9d3e5804fc24259bf59943ac14de4a3416a4856 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../event/entity/SkeletonHorseTrapEvent.java  | 24 +++++++++++++++++++
- 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 d79dbcd6..1ed3ea8f 100644
@@ -63,6 +60,3 @@ index d79dbcd6..1ed3ea8f 100644
     @Override
     public boolean isCancelled() {
         return cancelled;
-- 
-2.26.2
-
--- a/patches/api/0022-PaperPR-PlayerItemCooldownEvent.patch
+++ b/patches/api/0022-PaperPR-PlayerItemCooldownEvent.patch
@@ -1,12 +1,8 @@
-From 855fc3bdef2953107a8e75a953c086a7866eb024 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../event/player/PlayerItemCooldownEvent.java | 77 +++++++++++++++++++
- 1 file changed, 77 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java

 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
@@ -91,6 +87,3 @@ index 00000000..2002909f
 +        return handlers;
 +    }
 +}
-- 
-2.26.2
-
--- a/patches/api/0023-EntityMoveEvent.patch
+++ b/patches/api/0023-EntityMoveEvent.patch
@@ -1,12 +1,8 @@
-From 9c6e4fddc16253233e0cca1d093e76d8c4ac64a9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../purpur/event/entity/EntityMoveEvent.java  | 95 +++++++++++++++++++
- 1 file changed, 95 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java

 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
@@ -109,6 +105,3 @@ index 00000000..c48c525b
 +        return handlers;
 +    }
 +}
-- 
-2.26.2
-
--- a/patches/api/0024-PaperPR-BellRingEvent.patch
+++ b/patches/api/0024-PaperPR-BellRingEvent.patch
@@ -1,14 +1,10 @@
-From 13467a78b38df42ecee499849c1bf9ceb914bfdf Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

 Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
---
- .../paper/event/block/BellRingEvent.java      | 53 +++++++++++++++++++
- 1 file changed, 53 insertions(+)
- create mode 100644 src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java

 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
@@ -69,6 +65,3 @@ index 00000000..82e0a747
 +        return handlers;
 +    }
 +}
-- 
-2.26.2
-
--- a/patches/api/0025-Player-invulnerabilities.patch
+++ b/patches/api/0025-Player-invulnerabilities.patch
@@ -1,11 +1,8 @@
-From 471dd5a530419f3dc9af3601d37ef3f2957291c5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/entity/Player.java | 21 +++++++++++++++++++++
- 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 2dca16ac..55edcd54 100644
@@ -38,6 +35,3 @@ index 2dca16ac..55edcd54 100644
 +    void setSpawnInvulnerableTicks(int invulnerableTicks);
     // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0026-Anvil-API.patch
+++ b/patches/api/0026-Anvil-API.patch
@@ -1,15 +1,8 @@
-From 2e6244aec6bbbb3846c4ba2c59998c44e605ace9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../event/inventory/AnvilTakeResultEvent.java | 52 +++++++++++++++++++
- .../inventory/AnvilUpdateResultEvent.java     | 35 +++++++++++++
- .../org/bukkit/inventory/AnvilInventory.java  | 10 ++++
- 3 files changed, 97 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
- create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java

 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
@@ -129,6 +122,3 @@ index b95e563b..435026e5 100644
 +    void setDoUnsafeEnchants(boolean canDoUnsafeEnchants);
 +    // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0027-ItemStack-convenience-methods.patch
+++ b/patches/api/0027-ItemStack-convenience-methods.patch
@@ -1,12 +1,8 @@
-From 90d4f270ec4296b0f0c013e8d3a97a5c4babe79a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- src/main/java/org/bukkit/Material.java        |  32 +
- .../java/org/bukkit/inventory/ItemStack.java  | 619 ++++++++++++++++++
- 2 files changed, 651 insertions(+)

 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
 index 3a8438fb..e7167d11 100644
@@ -684,6 +680,3 @@ index ccd81fca..c38fd840 100644
 +
 +    // Purpur end
 }
-- 
-2.26.2
-
--- a/patches/api/0028-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/api/0028-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -1,11 +1,8 @@
-From 20a60758768a69b9083d1c079b15571860979291 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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

---
- .../java/com/destroystokyo/paper/entity/ai/VanillaGoal.java   | 4 ++++
- 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 d7f1b2c8..8d25b6f0 100644
@@ -20,6 +17,3 @@ index d7f1b2c8..8d25b6f0 100644
 +    GoalKey<Phantom> ORBIT_CRYSTAL_GOAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal_goal"));
 +    // Purpur end
 }
-- 
-2.26.2
-