Rebuild patches

patches/api/0013-MoonPhase-API.patch

@@ -1,69 +0,0 @@
-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
-
-
-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
---- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
-@@ -0,0 +1,36 @@
-+package net.pl3x.purpur;
-+
-+import org.jetbrains.annotations.NotNull;
-+
-+import java.util.HashMap;
-+import java.util.Map;
-+
-+public enum MoonPhase {
-+    FULL_MOON(0L),
-+    WANING_GIBBOUS(1L),
-+    LAST_QUARTER(2L),
-+    WANING_CRESCENT(3L),
-+    NEW_MOON(4L),
-+    WAXING_CRESCENT(5L),
-+    FIRST_QUARTER(6L),
-+    WAXING_GIBBOUS(7L);
-+
-+    private final long day;
-+
-+    MoonPhase(long day) {
-+        this.day = day;
-+    }
-+
-+    private static final Map<Long, MoonPhase> BY_DAY = new HashMap<>();
-+
-+    static {
-+        for (MoonPhase phase : values()) {
-+            BY_DAY.put(phase.day, phase);
-+        }
-+    }
-+
-+    @NotNull
-+    public static MoonPhase getPhase(long day) {
-+        return BY_DAY.get(day % 8L);
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e827e1a6f..2685dfa18 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -3466,6 +3466,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
-     @NotNull
-     public List<Raid> getRaids();
- 
-+    // Purpur start
-+    /**
-+     * Get the moon phase of the world at the current time
-+     *
-+     * @return Current moon phase
-+     */
-+    @NotNull
-+    net.pl3x.purpur.MoonPhase getMoonPhase();
-+    // Purpur end
-+
-     /**
-      * Get the {@link DragonBattle} associated with this world.
-      *

patches/api/0014-ItemFactory-getMonsterEgg.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ItemFactory#getMonsterEgg
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 03ba2265..630c15d2 100644
+index 03ba22659..630c15d23 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/0015-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -6,7 +6,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 00000000..c050b75e
+index 000000000..c050b75e9
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 @@ -0,0 +1,85 @@

patches/api/0016-EMC-MonsterEggSpawnEvent.patch

@@ -6,7 +6,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 00000000..983d6723
+index 000000000..983d67234
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 @@ -0,0 +1,67 @@

patches/api/0017-Villager-resetOffers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Villager#resetOffers
 
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index c8777a47..ed703af4 100644
+index c8777a476..ed703af45 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/0018-LivingEntity-playPickupItemAnimation.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#playPickupItemAnimation
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5b688cd0..a0db7694 100644
+index 5b688cd04..a0db76946 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/0019-SkeletonHorseTrapEvent-getPlayer.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer
 
 
 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
+index d79dbcd68..1ed3ea8fa 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/0020-PaperPR-PlayerItemCooldownEvent.patch

@@ -6,7 +6,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 00000000..2002909f
+index 000000000..2002909f3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 @@ -0,0 +1,77 @@

patches/api/0021-EntityMoveEvent.patch

@@ -6,7 +6,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 00000000..c48c525b
+index 000000000..c48c525b8
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 @@ -0,0 +1,95 @@

patches/api/0022-PaperPR-BellRingEvent.patch

@@ -8,7 +8,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 00000000..82e0a747
+index 000000000..82e0a747b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java
 @@ -0,0 +1,53 @@

patches/api/0023-Player-invulnerabilities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9dbfe361..1dfe5540 100644
+index 9dbfe3614..1dfe55402 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1897,5 +1897,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0024-Anvil-API.patch

@@ -6,7 +6,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 00000000..85663c0a
+index 000000000..85663c0a4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 @@ -0,0 +1,52 @@
@@ -64,7 +64,7 @@ index 00000000..85663c0a
 +}
 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 00000000..2717ad82
+index 000000000..2717ad82c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 @@ -0,0 +1,35 @@
@@ -104,7 +104,7 @@ index 00000000..2717ad82
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-index b95e563b..435026e5 100644
+index b95e563b5..435026e53 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/0026-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 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 b4209175..83c51bb5 100644
+index b42091752..83c51bb5e 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -206,4 +206,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

patches/api/0027-ChatColor-conveniences.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ChatColor conveniences
 
 
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 4594701d..499b222d 100644
+index 4594701d7..499b222de 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -413,4 +413,30 @@ public enum ChatColor {

patches/api/0028-DragonEggPlaceEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] DragonEggPlaceEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java
 new file mode 100644
-index 00000000..bdabfd2b
+index 000000000..bdabfd2b5
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java
 @@ -0,0 +1,47 @@

patches/api/0029-Ridables.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Ridables
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 new file mode 100644
-index 00000000..c0ec5a13
+index 000000000..c0ec5a130
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 @@ -0,0 +1,37 @@
@@ -48,7 +48,7 @@ index 00000000..c0ec5a13
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 7808ade9..5abf3eaf 100644
+index 7808ade92..5abf3eaf3 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -695,4 +695,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent