Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly Paper Changes: df0d7b0d Update upstream CB 6ea3c2cf [CI-SKIP] Rebuild patches d7bed4cb Heavily optimise random block ticking (#2914) b66d9ff8 Update upstream CB ba71c5d6 Stop stripping private use block Unicode from signs 28d9dcfc Entity Jump API (#1587) 9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion 054e20da Clean up imports on ThrownEggHatchEvent a8984ccb Add ThrownEggHatchEvent (#1982) 9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
2026-02-20 09:57:43 +01:00 · 2020-02-12 21:21:34 -06:00
parent e52e23265f
commit 4757060211
159 changed files with 6166 additions and 4642 deletions
--- a/patches/api/0001-Rebrand.patch
+++ b/patches/api/0001-Rebrand.patch
@@ -1,12 +1,12 @@
-From 3fcfaee80a5a2fda4d08e86daf4401f4d8529ab2 Mon Sep 17 00:00:00 2001
+From 991336514b39c0b09f2aa31b78647b0a9728e40f 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 ++++++-------
- src/main/java/co/aikar/timings/TimingsExport.java |  4 ++--
- 2 files changed, 8 insertions(+), 9 deletions(-)
+ src/main/java/co/aikar/timings/TimingsExport.java |  2 +-
+ 2 files changed, 7 insertions(+), 8 deletions(-)

 diff --git a/pom.xml b/pom.xml
 index 2cb97140..58a1f7d0 100644
@@ -46,25 +46,18 @@ index 2cb97140..58a1f7d0 100644
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 23eb8c65..667de7bd 100644
+index 23eb8c65..b3739826 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -283,13 +283,13 @@ class TimingsExport extends Thread {
+@@ -283,7 +283,7 @@ class TimingsExport extends Thread {
         String response = null;
         String timingsURL = null;
         try {
 -            HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
-+            HttpURLConnection con = (HttpURLConnection) new URL("https://timings.pl3x.net/post").openConnection();
+            HttpURLConnection con = (HttpURLConnection) new URL("http://timings.pl3x.net/post").openConnection();
             con.setDoOutput(true);
             String hostName = "BrokenHost";
             try {
-                 hostName = InetAddress.getLocalHost().getHostName();
-             } catch (Exception ignored) {}
-            con.setRequestProperty("User-Agent", "Paper/" + Bukkit.getUnsafe().getTimingsServerName() + "/" + hostName);
-+            con.setRequestProperty("User-Agent", "Purpur/" + Bukkit.getUnsafe().getTimingsServerName() + "/" + hostName);
-             con.setRequestMethod("POST");
-             con.setInstanceFollowRedirects(false);
- 
 -- 
 2.24.0

--- a/patches/api/0002-Ridables.patch
+++ b/patches/api/0002-Ridables.patch
@@ -0,0 +1,104 @@
+From 58f629ff04510107d4e0005e5cfc3c614ecbcf52 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
+
+---
+ .../event/entity/RidableSpacebarEvent.java    | 37 ++++++++++++++++++
+ src/main/java/org/bukkit/entity/Entity.java   | 38 +++++++++++++++++++
+ 2 files changed, 75 insertions(+)
+ create mode 100644 src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
+
+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
+--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
+@@ -0,0 +1,37 @@
+package net.pl3x.purpur.event.entity;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class RidableSpacebarEvent extends EntityEvent implements Cancellable {
+    private static final HandlerList handlers = new HandlerList();
+    private boolean cancelled;
+
+    public RidableSpacebarEvent(@NotNull Entity entity) {
+        super(entity);
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        cancelled = cancel;
+    }
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}
+diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
+index 5518ecd2..809021b2 100644
+--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
+@@ -656,4 +656,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+     @NotNull
+     org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
+     // Paper end
+
+    // Purpur start
+    /**
+     * Get the riding player
+     *
+     * @return Riding player
+     */
+    @Nullable
+    Player getRider();
+
+    /**
+     * Check if entity is being ridden
+     *
+     * @return True if being ridden
+     */
+    boolean hasRider();
+
+    /**
+     * Check if entity is ridable
+     *
+     * @return True if ridable
+     */
+    boolean isRidable();
+
+    /**
+     * Check if entity is ridable in water
+     *
+     * @return True if ridable in water
+     */
+    boolean isRidableInWater();
+
+    /**
+     * Check if shift is required to mount this entity
+     *
+     * @return True if shift is required
+     */
+    boolean requireShiftToMount();
+    // Purpur end
+ }
+-- 
+2.24.0
+
--- a/patches/api/0003-Remove-pointless-annotations-and-deprecations.patch
+++ b/patches/api/0003-Remove-pointless-annotations-and-deprecations.patch
@@ -1,4 +1,4 @@
-From c1200033ce45f4a05561b8f86f3a354014471567 Mon Sep 17 00:00:00 2001
+From 310e46f83be4cb38be1ba3e3c13683253d3cc45f 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 5c39d73f2..10d0537d0 100644
+index 355bd2e2..50415189 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -807,13 +807,10 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index 5c39d73f2..10d0537d0 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 88b7d606c..97a981923 100644
+index 98e7ba90..248c32b0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -672,13 +672,10 @@ public interface Server extends PluginMessageRecipient {
@@ -50,7 +50,7 @@ index 88b7d606c..97a981923 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 45cb8da12..383b43e1b 100644
+index 45cb8da1..383b43e1 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 45cb8da12..383b43e1b 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 e9cf71f5c..34d3462c7 100644
+index e9cf71f5..34d3462c 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 e9cf71f5c..34d3462c7 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 d7d6a3e83..cf8d77491 100644
+index d7d6a3e8..cf8d7749 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 d7d6a3e83..cf8d77491 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 04fa3991f..24d65491c 100644
+index 04fa3991..24d65491 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 04fa3991f..24d65491c 100644
     }
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index a48be38b1..951b81e79 100644
+index a48be38b..951b81e7 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -41,6 +41,11 @@ public class AnnotationTest {
--- a/patches/api/0003-cows-to-mooshroom-when-fed-mushrooms.patch
+++ b/patches/api/0003-cows-to-mooshroom-when-fed-mushrooms.patch
@@ -1,47 +0,0 @@
-From 1e48e4bb7fdee96019ee7217e9826aaa8df2c14c Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 3 May 2019 23:21:23 -0500
-Subject: [PATCH] cows to mooshroom when fed mushrooms
-
---
- .../paper/event/entity/EntityTransformedEvent.java          | 6 ++++++
- .../java/org/bukkit/event/entity/EntityTransformEvent.java  | 6 ++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
-index 12194f1fc..8b2e533d3 100644
--- a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
-+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
-@@ -83,6 +83,12 @@ public class EntityTransformedEvent extends EntityEvent implements Cancellable {
-          * When a mooshroom turns to a cow
-          */
-         SHEARED,
-+        // Purpur start
-+        /**
-+         * When a cow turns to a mooshroom
-+         */
-+        SHROOMED,
-+        // Purpur end
-         /**
-          * When a pig turns to a zombiepigman
-          */
-diff --git a/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java b/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java
-index 1370380ae..b1c265194 100644
--- a/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java
-@@ -96,6 +96,12 @@ public class EntityTransformEvent extends EntityEvent implements Cancellable {
-          * When a mooshroom (or MUSHROOM_COW) is sheared and a cow spawns.
-          */
-         SHEARED,
-+        // Purpur start
-+        /**
-+         * When a cow turns to a mooshroom
-+         */
-+        SHROOMED,
-+        // Purpur end
-         /**
-          * When lightning strikes a entity.
-          */
-- 
-2.20.1
-
--- a/patches/api/0004-Allow-inventory-resizing.patch
+++ b/patches/api/0004-Allow-inventory-resizing.patch
@@ -1,4 +1,4 @@
-From 7a311ecfaa92372c2c11233b1d68fe4b46f4262f Mon Sep 17 00:00:00 2001
+From feca342eda755a4e536ec48a4c1d528c80a35402 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 75e719ae8..fb7abc2a5 100644
+index 10c3b6d7..931e5ff7 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
@@ -128,7 +128,7 @@ public enum InventoryType {
@@ -34,5 +34,5 @@ index 75e719ae8..fb7abc2a5 100644
         return size;
     }
 -- 
-2.23.0.rc1
+2.24.0

--- a/patches/api/0005-Implement-AFK-API.patch
+++ b/patches/api/0005-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 2fa5ae33c37672f73d97561789f802555505ab5a Mon Sep 17 00:00:00 2001
+From 4d187d87c842770caedf16ca9f051fd1b3732d9d 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement 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..4db334854
+index 00000000..4db33485
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
@@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 000000000..4db334854
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 877ea4f32..b9fe2a0fa 100644
+index 877ea4f3..b9fe2a0f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/patches/api/0005-Integrate-ridables.patch
+++ b/patches/api/0005-Integrate-ridables.patch
@@ -1,62 +0,0 @@
-From ec82ba52f74b2cd9cb328e4ee9424b30f2e5c018 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 3 May 2019 06:08:35 -0500
-Subject: [PATCH] Integrate ridables
-
---
- .../java/org/bukkit/entity/LivingEntity.java     | 14 ++++++++++++++
- src/main/java/org/bukkit/entity/Mob.java         | 16 ++++++++++++++++
- 2 files changed, 30 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f47a6869f..3a8961853 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -696,5 +696,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param safeFallDistance Safe fall distance
-      */
-     void setSafeFallDistance(float safeFallDistance);
-+
-+    /**
-+     * Whether or not this entity can be ridden in water
-+     *
-+     * @return Whether or not this entity can be ridden in water
-+     */
-+    boolean canBeRiddenInWater();
-+
-+    /**
-+     * Set whether or not this entity can be ridden in water
-+     *
-+     * @param canBeRiddenInWater Whether or not this entity can be ridden in water
-+     */
-+    void setCanBeRiddenInWater(boolean canBeRiddenInWater);
-     // Purpur end
- }
-diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index 784db447d..b3a9c1a45 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
-+++ b/src/main/java/org/bukkit/entity/Mob.java
-@@ -42,4 +42,20 @@ public interface Mob extends LivingEntity, Lootable {
-      */
-     @Nullable
-     public LivingEntity getTarget();
-+
-+    // Purpur start
-+    /**
-+     * Get if this mob is ridable
-+     *
-+     * @return True if ridable
-+     */
-+    boolean isRidable();
-+
-+    /**
-+     * Set if this mob is ridable
-+     *
-+     * @param ridable True to make ridable
-+     */
-+    void setRidable(boolean ridable);
-+    // Purpur end
- }
-- 
-2.20.1
-
--- a/patches/api/0006-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0006-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From 4caa1b9ad55df3d7d832905898fd2866d9871f13 Mon Sep 17 00:00:00 2001
+From 8f4805c659215292c3cc6ae82997f07764f28654 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent

 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityPortalReadyEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityPortalReadyEvent.java
 new file mode 100644
-index 000000000..37f11c104
+index 00000000..37f11c10
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityPortalReadyEvent.java
@@ -0,0 +1,40 @@
--- a/patches/api/0007-Add-tick-times-API.patch
+++ b/patches/api/0007-Add-tick-times-API.patch
@@ -1,25 +1,25 @@
-From ba6cb31517bc0cdeb1fb90caf3eb3bbc8d58c617 Mon Sep 17 00:00:00 2001
+From cf027551379cf75f6751acda9b3e8d1dc5b75dc1 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

 ---
- src/main/java/org/bukkit/Bukkit.java | 19 +++++++++++++++++++
- src/main/java/org/bukkit/Server.java | 15 +++++++++++++++
- 2 files changed, 34 insertions(+)
+ src/main/java/org/bukkit/Bukkit.java | 20 ++++++++++++++++++++
+ src/main/java/org/bukkit/Server.java | 17 +++++++++++++++++
+ 2 files changed, 37 insertions(+)

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 10d0537d0..d49cf61b4 100644
+index 50415189..36e48723 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1634,6 +1634,25 @@ public final class Bukkit {
-     public static boolean isLagging() {
-         return server.isLagging();
+@@ -1620,4 +1620,24 @@ public final class Bukkit {
+     public static Server.Spigot spigot() {
+         return server.spigot();
     }
 +
+    // Purpur start
 +    /**
 +     * Get the last 100 tick times (in nanos)
-+     *
 +     * @return Last 100 tick times (in nanos)
 +     */
 +    @NotNull
@@ -35,18 +35,18 @@ index 10d0537d0..d49cf61b4 100644
 +    public static double getAverageTickTime() {
 +        return server == null ? 0D : server.getAverageTickTime();
 +    }
-     // Purpur end
- 
-     @NotNull
+    // Purpur end
+ }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 97a981923..f98c6a046 100644
+index 248c32b0..c28cc59c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1428,5 +1428,20 @@ public interface Server extends PluginMessageRecipient {
-      * @return True if lagging
+@@ -1413,4 +1413,21 @@ public interface Server extends PluginMessageRecipient {
      */
-     boolean isLagging();
+     int getCurrentTick();
+     // Paper end
 +
+    // Purpur start
 +    /**
 +     * Get the last 100 tick times (in nanos)
 +     *
@@ -61,7 +61,7 @@ index 97a981923..f98c6a046 100644
 +     * @return Average tick time (in millis)
 +     */
 +    double getAverageTickTime();
-     // Purpur end
+    // Purpur end
 }
 -- 
 2.24.0
--- a/patches/api/0008-Bring-back-server-name.patch
+++ b/patches/api/0008-Bring-back-server-name.patch
@@ -1,22 +1,21 @@
-From e51447a1efd39253f34151d4229b2f68ac2a4328 Mon Sep 17 00:00:00 2001
+From 9c988f7504d9e12aca27e2835286ef100b5a4b43 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(+)
+ 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 355bd2e22..79560dcca 100644
+index 36e48723..451dc570 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1619,6 +1619,17 @@ public final class Bukkit {
+@@ -1622,6 +1622,15 @@ public final class Bukkit {
     }
-     // Paper end
 
-+    // Purpur start - bring back server name
+     // Purpur start
 +    /**
 +     * Get the name of this server
 +     * @return the name of the server
@@ -25,29 +24,28 @@ index 355bd2e22..79560dcca 100644
 +    public static String getServerName() {
 +        return server.getServerName();
 +    }
-+    // Purpur end
 +
-     @NotNull
-     public static Server.Spigot spigot() {
-         return server.spigot();
+     /**
+      * Get the last 100 tick times (in nanos)
+      * @return Last 100 tick times (in nanos)
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 98e7ba900..863da99d4 100644
+index c28cc59c..57bb2dde 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1416,4 +1416,13 @@ public interface Server extends PluginMessageRecipient {
-      */
-     int getCurrentTick();
+@@ -1415,6 +1415,13 @@ public interface Server extends PluginMessageRecipient {
     // Paper end
-+
-+    // Purpur start - bring back server name
+ 
+     // Purpur start
 +    /**
 +     * Get the name of this server
 +     * @return the name of the server
 +     */
 +    @NotNull
 +    String getServerName();
-+    // Purpur end
- }
+
+     /**
+      * Get the last 100 tick times (in nanos)
+      *
 -- 
 2.24.0

--- a/patches/api/0009-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/api/0009-Implement-LivingEntity-safeFallDistance.patch
@@ -1,4 +1,4 @@
-From 79e01bbeefe94343e21159ad58547e0af028ea5b Mon Sep 17 00:00:00 2001
+From d98d5e617a7514cd7b899a2d0fb8da7588b5c934 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
@@ -8,12 +8,12 @@ Subject: [PATCH] Implement 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 a78f390d7..f47a6869f 100644
+index 77f4246d..2e1e27b0 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -681,4 +681,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -701,4 +701,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      */
-     boolean isHandRaised();
+     void setJumping(boolean jumping);
     // Paper end
 +
 +    // Purpur start
@@ -33,5 +33,5 @@ index a78f390d7..f47a6869f 100644
 +    // Purpur end
 }
 -- 
-2.20.1
+2.24.0

--- a/patches/api/0010-Add-ExecuteCommandEvent.patch
+++ b/patches/api/0010-Add-ExecuteCommandEvent.patch
@@ -1,4 +1,4 @@
-From b83812676462910150c6547ac1e5249c10cb5783 Mon Sep 17 00:00:00 2001
+From 274c8049b8a80b1677134d12cabff19a0bfbad2e 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Add 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 {
@@ -179,5 +179,5 @@ index 460fda05a..1e0eb0999 100644
         } catch (CommandException ex) {
             server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper
 -- 
-2.23.0.rc1
+2.24.0

--- a/patches/api/0011-Implement-ChunkTooLargeEvent.patch
+++ b/patches/api/0011-Implement-ChunkTooLargeEvent.patch
@@ -1,4 +1,4 @@
-From f8e61f206d1d08534ccdfea936d48944e776113a Mon Sep 17 00:00:00 2001
+From b94ddbb2afac2538d00ac7adf6080f9e8a5e7d2e 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement ChunkTooLargeEvent

 diff --git a/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java b/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java
 new file mode 100644
-index 000000000..f9d4a42c6
+index 00000000..f9d4a42c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java
@@ -0,0 +1,109 @@
@@ -124,5 +124,5 @@ index 000000000..f9d4a42c6
 +    }
 +}
 -- 
-2.23.0.rc1
+2.24.0

--- a/patches/api/0012-Implement-lagging-threshold.patch
+++ b/patches/api/0012-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From 41324ce78820672bb1261893cceefd11d6022bd0 Mon Sep 17 00:00:00 2001
+From ae537506a49446a9f91e2fec2bfc636debe99fe4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -9,14 +9,13 @@ Subject: [PATCH] Implement lagging threshold
 2 files changed, 16 insertions(+)

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 79560dcca..5c39d73f2 100644
+index 451dc570..7bdd962b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1628,6 +1628,15 @@ public final class Bukkit {
-     public static String getServerName() {
+@@ -1631,6 +1631,15 @@ public final class Bukkit {
         return server.getServerName();
     }
-+
+ 
 +    /**
 +     * Check if server is lagging according to laggy threshold setting
 +     *
@@ -25,26 +24,28 @@ index 79560dcca..5c39d73f2 100644
 +    public static boolean isLagging() {
 +        return server.isLagging();
 +    }
-     // Purpur end
- 
-     @NotNull
+
+     /**
+      * Get the last 100 tick times (in nanos)
+      * @return Last 100 tick times (in nanos)
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 863da99d4..88b7d606c 100644
+index 57bb2dde..ca195120 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1424,5 +1424,12 @@ public interface Server extends PluginMessageRecipient {
-      */
+@@ -1422,6 +1422,13 @@ public interface Server extends PluginMessageRecipient {
     @NotNull
     String getServerName();
-+
+ 
 +    /**
 +     * Check if server is lagging according to laggy threshold setting
 +     *
 +     * @return True if lagging
 +     */
 +    boolean isLagging();
-     // Purpur end
- }
+
+     /**
+      * Get the last 100 tick times (in nanos)
+      *
 -- 
 2.24.0

--- a/patches/api/0013-Advancement-API-Additions.patch
+++ b/patches/api/0013-Advancement-API-Additions.patch
@@ -1,4 +1,4 @@
-From 75d012a30e129dfce7a9d17c99e2e69399f48e3f Mon Sep 17 00:00:00 2001
+From e65b38277758c8b2133f679404b5ec33a70fd072 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
--- a/patches/api/0014-Implement-ItemFactory-getMonsterEgg.patch
+++ b/patches/api/0014-Implement-ItemFactory-getMonsterEgg.patch
@@ -1,4 +1,4 @@
-From 9bf10e66e9db9009871610710edb16a8ce420688 Mon Sep 17 00:00:00 2001
+From ffb5a9e257eb752cc814a8c2ad34281fc0cbcedd 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement 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 {
@@ -28,5 +28,5 @@ index 03ba22659..630c15d23 100644
 +    // Purpur end
 }
 -- 
-2.23.0.rc1
+2.24.0

--- a/patches/api/0015-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/api/0015-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,4 +1,4 @@
-From 0d962b82c49e96e14993d5dda1422e617dd5d3c6 Mon Sep 17 00:00:00 2001
+From 2bc86d35277b1f10a66da66679ebad753cc5e2e6 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement 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 @@
@@ -100,5 +100,5 @@ index 000000000..c050b75e9
 +    }
 +}
 -- 
-2.23.0.rc1
+2.24.0

--- a/patches/api/0016-Add-MonsterEggSpawnEvent.patch
+++ b/patches/api/0016-Add-MonsterEggSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 32f1ce9130091a21f6e05bfc6a655ae7d8d91cac Mon Sep 17 00:00:00 2001
+From f9b7f2c2980f030dac545c5968f53ff0336919ee 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 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 @@
@@ -82,5 +82,5 @@ index 000000000..983d67234
 +    }
 +}
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0017-Add-ThrownEggHatchEvent.patch
+++ b/patches/api/0017-Add-ThrownEggHatchEvent.patch
@@ -1,4 +1,4 @@
-From f3d4ab537b7cd73292713f6571fe36c876910483 Mon Sep 17 00:00:00 2001
+From 2cc5826c577ada95c503685def71ca2229fc42b2 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add ThrownEggHatchEvent

 diff --git a/src/main/java/net/pl3x/purpur/event/entity/ThrownEggHatchEvent.java b/src/main/java/net/pl3x/purpur/event/entity/ThrownEggHatchEvent.java
 new file mode 100644
-index 000000000..815e871d0
+index 00000000..815e871d
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/ThrownEggHatchEvent.java
@@ -0,0 +1,113 @@
@@ -128,5 +128,5 @@ index 000000000..815e871d0
 +    }
 +}
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0018-Add-block-and-fluid-tick-events.patch
+++ b/patches/api/0018-Add-block-and-fluid-tick-events.patch
@@ -1,179 +0,0 @@
-From 5c6ebf213cb5ff0c16fb1c8f2e7721b666873ae7 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 18 Oct 2019 23:58:29 -0500
-Subject: [PATCH] Add block and fluid tick events
-
---
- .../purpur/event/block/BlockTickEvent.java    | 55 +++++++++++++++++++
- .../purpur/event/block/FluidTickEvent.java    | 55 +++++++++++++++++++
- src/main/java/org/bukkit/World.java           | 30 ++++++++++
- 3 files changed, 140 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java
- create mode 100644 src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java
-
-diff --git a/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java
-new file mode 100644
-index 00000000..02787304
--- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java
-@@ -0,0 +1,55 @@
-+package net.pl3x.purpur.event.block;
-+
-+import org.bukkit.World;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.block.BlockEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when a block is ticked by the server.
-+ */
-+public class BlockTickEvent extends BlockEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private final boolean isRandomTick;
-+    private boolean cancelled;
-+
-+    public BlockTickEvent(@NotNull World world, int x, int y, int z) {
-+        this(world, x, y, z, false);
-+    }
-+
-+    public BlockTickEvent(@NotNull World world, int x, int y, int z, boolean isRandomTick) {
-+        super(world.getBlockAt(x, y, z));
-+        this.isRandomTick = isRandomTick;
-+    }
-+
-+    /**
-+     * Check if this is a random tick
-+     *
-+     * @return True if random
-+     */
-+    public boolean isRandomTick() {
-+        return isRandomTick;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        cancelled = cancel;
-+    }
-+
-+    @Override
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java
-new file mode 100644
-index 00000000..1a8f0b67
--- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java
-@@ -0,0 +1,55 @@
-+package net.pl3x.purpur.event.block;
-+
-+import org.bukkit.World;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.block.BlockEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when a fluid is ticked by the server.
-+ */
-+public class FluidTickEvent extends BlockEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private final boolean isRandomTick;
-+    private boolean cancelled;
-+
-+    public FluidTickEvent(@NotNull World world, int x, int y, int z) {
-+        this(world, x, y, z, false);
-+    }
-+
-+    public FluidTickEvent(@NotNull World world, int x, int y, int z, boolean isRandomTick) {
-+        super(world.getBlockAt(x, y, z));
-+        this.isRandomTick = isRandomTick;
-+    }
-+
-+    /**
-+     * Check if this is a random tick
-+     *
-+     * @return True if random
-+     */
-+    public boolean isRandomTick() {
-+        return isRandomTick;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        cancelled = cancel;
-+    }
-+
-+    @Override
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5047be15..c12d0efc 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -3117,6 +3117,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
-     @NotNull
-     public List<Raid> getRaids();
- 
-+    // Purpur start
-+    /**
-+     * Get if {@link net.pl3x.purpur.event.block.BlockTickEvent} is enabled for this world
-+     *
-+     * @return True if enabled
-+     */
-+    boolean isBlockTickEventEnabled();
-+
-+    /**
-+     * Set if {@link net.pl3x.purpur.event.block.BlockTickEvent} is enabled for this world
-+     *
-+     * @param enabled True to enable
-+     */
-+    void setBlockTickEventEnabled(boolean enabled);
-+
-+    /**
-+     * Get if {@link net.pl3x.purpur.event.block.FluidTickEvent} is enabled for this world
-+     *
-+     * @return True if enabled
-+     */
-+    boolean isFluidTickEventEnabled();
-+
-+    /**
-+     * Set if {@link net.pl3x.purpur.event.block.FluidTickEvent} is enabled for this world
-+     *
-+     * @param enabled True to enable
-+     */
-+    void setFluidTickEventEnabled(boolean enabled);
-+    // Purpur end
-+
-     /**
-      * Represents various map environment types that a world may be
-      */
-- 
-2.24.0
-
--- a/patches/api/0018-Add-moon-phase-API.patch
+++ b/patches/api/0018-Add-moon-phase-API.patch
@@ -1,12 +1,12 @@
-From 08f61132cb4349e6e64d37f4bd67fb233ede48f7 Mon Sep 17 00:00:00 2001
+From 5290786e816577b65635c4bf4f19a5c0161cbd01 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

 ---
 src/main/java/net/pl3x/purpur/MoonPhase.java | 36 ++++++++++++++++++++
- src/main/java/org/bukkit/World.java          |  8 +++++
- 2 files changed, 44 insertions(+)
+ 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
@@ -52,14 +52,14 @@ index 00000000..f5ad98c6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 07e0f604..7566d701 100644
+index 5047be15..80d63e25 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3155,6 +3155,14 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      */
+@@ -3117,6 +3117,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
     @NotNull
-     BlockData getPlacementBlockData(@NotNull BlockData blockData, @NotNull Location location);
-+
+     public List<Raid> getRaids();
+ 
+    // Purpur start
 +    /**
 +     * Get the moon phase of the world at the current time
 +     *
@@ -67,9 +67,11 @@ index 07e0f604..7566d701 100644
 +     */
 +    @NotNull
 +    net.pl3x.purpur.MoonPhase getMoonPhase();
-     // Purpur end
- 
+    // Purpur end
+
     /**
+      * Represents various map environment types that a world may be
+      */
 -- 
 2.24.0

--- a/patches/api/0019-Add-API-for-Villager-resetOffers.patch
+++ b/patches/api/0019-Add-API-for-Villager-resetOffers.patch
@@ -1,4 +1,4 @@
-From 559bc1e8985c4eac9aec6b3e33b8e9f269279860 Mon Sep 17 00:00:00 2001
+From 4ab0e022aceb013cac96033a9831f04f773a42ab 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()
@@ -8,7 +8,7 @@ Subject: [PATCH] Add API for 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 ef48ad9b2..2bb9f768b 100644
+index ef48ad9b..2bb9f768 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -96,6 +96,13 @@ public interface Villager extends AbstractVillager {
@@ -26,5 +26,5 @@ index ef48ad9b2..2bb9f768b 100644
      * Represents Villager type, usually corresponding to what biome they spawn
      * in.
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0020-Expose-getItemStack-for-Trident.patch
+++ b/patches/api/0020-Expose-getItemStack-for-Trident.patch
@@ -1,4 +1,4 @@
-From 0d5448283a81da963c941a60293006682b6c1e07 Mon Sep 17 00:00:00 2001
+From a3f61fb19e894e0cfa62861f71d831da596b7e56 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Expose getItemStack for Trident
 1 file changed, 11 insertions(+), 1 deletion(-)

 diff --git a/src/main/java/org/bukkit/entity/Trident.java b/src/main/java/org/bukkit/entity/Trident.java
-index 3379ef9ba..27f19074e 100644
+index 3379ef9b..27f19074 100644
 --- a/src/main/java/org/bukkit/entity/Trident.java
 +++ b/src/main/java/org/bukkit/entity/Trident.java
@@ -3,4 +3,14 @@ package org.bukkit.entity;
@@ -28,5 +28,5 @@ index 3379ef9ba..27f19074e 100644
 +    // Purpur end
 +}
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0021-Add-more-llama-API.patch
+++ b/patches/api/0021-Add-more-llama-API.patch
@@ -1,4 +1,4 @@
-From 8396505c1ca9dc7b9a9980c8f5e1dbdc5d86a387 Mon Sep 17 00:00:00 2001
+From 82710ce4f071a88af2810cd1fb22f102e8c19f16 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
@@ -13,7 +13,7 @@ Subject: [PATCH] Add more 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;
@@ -197,5 +197,5 @@ index d23226ccb..1ef9479c9 100644
 +    // Purpur end
 }
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0022-Add-entity-jump-API.patch
+++ b/patches/api/0022-Add-entity-jump-API.patch
@@ -1,4 +1,4 @@
-From 5ca385b0adb500d67a5ae59cda74cbcbe05a2cc7 Mon Sep 17 00:00:00 2001
+From 1a90d723b2773b3f90a56661c62366449bb90a41 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:34:38 -0500
 Subject: [PATCH] Add entity jump API
@@ -11,7 +11,7 @@ Subject: [PATCH] Add entity jump API

 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityJumpEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityJumpEvent.java
 new file mode 100644
-index 000000000..08546c01d
+index 00000000..08546c01
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityJumpEvent.java
@@ -0,0 +1,46 @@
@@ -62,13 +62,13 @@ index 000000000..08546c01d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 3a8961853..7196c1b79 100644
+index 2e1e27b0..cf9b6252 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -710,5 +710,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param canBeRiddenInWater Whether or not this entity can be ridden in water
+@@ -716,5 +716,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+      * @param safeFallDistance Safe fall distance
      */
-     void setCanBeRiddenInWater(boolean canBeRiddenInWater);
+     void setSafeFallDistance(float safeFallDistance);
 +
 +    /**
 +     * Get entity jump state
@@ -93,5 +93,5 @@ index 3a8961853..7196c1b79 100644
     // Purpur end
 }
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0023-Add-more-evoker-API.patch
+++ b/patches/api/0023-Add-more-evoker-API.patch
@@ -1,4 +1,4 @@
-From d39d81493739e7454eaa6d595e207971ed2bb086 Mon Sep 17 00:00:00 2001
+From 982bdd34f20dbf01dd5161f7c40954a923ec905f 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Add more 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 {
@@ -34,5 +34,5 @@ index f8d173adc..f2a03f7f8 100644
 +    // Purpur end
 }
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0024-Add-getPlacementBlockData-to-World.patch
+++ b/patches/api/0024-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From 0961dfd2209679bbd2bf0f76de5a6c77bfca7eb1 Mon Sep 17 00:00:00 2001
+From b0a84079d3680d3de82ea32fefb46d479ba874e2 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,13 +8,13 @@ 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 c12d0efc..07e0f604 100644
+index 80d63e25..3a0be100 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3145,6 +3145,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      * @param enabled True to enable
+@@ -3125,6 +3125,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
      */
-     void setFluidTickEventEnabled(boolean enabled);
+     @NotNull
+     net.pl3x.purpur.MoonPhase getMoonPhase();
 +
 +    /**
 +     * Get the hypothetical BlockData that would apply if one tries to set the given BlockData
--- a/patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 6469abdfd45c6db049434e337552f85b5f8cd87c Mon Sep 17 00:00:00 2001
+From 0712c2e0d32b466effab27107ba67554f7c20279 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
@@ -8,10 +8,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 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 7196c1b79..5789b4584 100644
+index cf9b6252..34848e54 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -731,5 +731,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -737,5 +737,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      * @param jumping Jump state
      */
     void setJumping(boolean jumping);
@@ -35,5 +35,5 @@ index 7196c1b79..5789b4584 100644
     // Purpur end
 }
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
+++ b/patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
@@ -1,4 +1,4 @@
-From 8012a7d2499ce4337afaec99eab86a337090bcdd Mon Sep 17 00:00:00 2001
+From 4d106e53be61ef261508b0d0446a8d6091046b5d 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
 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 @@
@@ -64,5 +64,5 @@ index d79dbcd68..1ed3ea8fa 100644
     public boolean isCancelled() {
         return cancelled;
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0027-Add-LootableInventoryFirstFillEvent.patch
+++ b/patches/api/0027-Add-LootableInventoryFirstFillEvent.patch
@@ -1,4 +1,4 @@
-From 180cfc574c9ad070004fd1ffc2681b454f657e3d Mon Sep 17 00:00:00 2001
+From 9ba4891ed833191457fd5c47ac6fea3b13a2b004 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add LootableInventoryFirstFillEvent

 diff --git a/src/main/java/net/pl3x/purpur/event/block/LootableInventoryFirstFillEvent.java b/src/main/java/net/pl3x/purpur/event/block/LootableInventoryFirstFillEvent.java
 new file mode 100644
-index 000000000..ef8eafb7c
+index 00000000..ef8eafb7
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/block/LootableInventoryFirstFillEvent.java
@@ -0,0 +1,42 @@
@@ -57,5 +57,5 @@ index 000000000..ef8eafb7c
 +    }
 +}
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
+++ b/patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch
@@ -1,4 +1,4 @@
-From 53543ffa1feb61f871821e93f329ba8f6f3d92d7 Mon Sep 17 00:00:00 2001
+From 59558c50dd67e0e2bc093f1f9b93e21a5c154fe3 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon
 2 files changed, 8 insertions(+), 3 deletions(-)

 diff --git a/src/main/java/org/bukkit/PortalType.java b/src/main/java/org/bukkit/PortalType.java
-index 427cfbb8b..e23565323 100644
+index 427cfbb8..e2356532 100644
 --- a/src/main/java/org/bukkit/PortalType.java
 +++ b/src/main/java/org/bukkit/PortalType.java
@@ -15,6 +15,13 @@ public enum PortalType {
@@ -27,7 +27,7 @@ index 427cfbb8b..e23565323 100644
      * This is a custom Plugin portal.
      */
 diff --git a/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java b/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
-index 397baaefd..7456240b4 100644
+index 397baaef..7456240b 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
@@ -11,10 +11,8 @@ import org.jetbrains.annotations.NotNull;
@@ -43,5 +43,5 @@ index 397baaefd..7456240b4 100644
     private static final HandlerList handlers = new HandlerList();
     private final List<BlockState> blocks;
 -- 
-2.24.0.rc1
+2.24.0

--- a/patches/api/0029-Implement-EntityMoveEvent.patch
+++ b/patches/api/0029-Implement-EntityMoveEvent.patch
@@ -0,0 +1,114 @@
+From 59a1e6ab2110ae99aae09ae0ca6686493273c7a2 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
+
+---
+ .../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
+index 00000000..4aff85b3
+--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
+@@ -0,0 +1,95 @@
+package net.pl3x.purpur.event.entity;
+
+import com.google.common.base.Preconditions;
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Holds information for living entity movement events
+ */
+public class EntityMoveEvent extends EntityEvent implements Cancellable {
+    private static final HandlerList handlers = new HandlerList();
+    private boolean canceled;
+    private Location from;
+    private Location to;
+
+    public EntityMoveEvent(@NotNull LivingEntity entity, Location from, Location to) {
+        super(entity);
+        this.from = from;
+        this.to = to;
+    }
+
+    @Override
+    @NotNull
+    public LivingEntity getEntity() {
+        return (LivingEntity) entity;
+    }
+
+    public boolean isCancelled() {
+        return canceled;
+    }
+
+    public void setCancelled(boolean cancel) {
+        canceled = cancel;
+    }
+
+    /**
+     * Gets the location this entity moved from
+     *
+     * @return Location the entity moved from
+     */
+    @NotNull
+    public Location getFrom() {
+        return from;
+    }
+
+    /**
+     * Sets the location to mark as where the entity moved from
+     *
+     * @param from New location to mark as the entity's previous location
+     */
+    public void setFrom(@NotNull Location from) {
+        validateLocation(from);
+        this.from = from;
+    }
+
+    /**
+     * Gets the location this entity moved to
+     *
+     * @return Location the entity moved to
+     */
+    @NotNull
+    public Location getTo() {
+        return to;
+    }
+
+    /**
+     * Sets the location that this entity will move to
+     *
+     * @param to New Location this entity will move to
+     */
+    public void setTo(@NotNull Location to) {
+        validateLocation(to);
+        this.to = to;
+    }
+
+    private void validateLocation(@NotNull Location loc) {
+        Preconditions.checkArgument(loc != null, "Cannot use null location!");
+        Preconditions.checkArgument(loc.getWorld() != null, "Cannot use null location with null world!");
+    }
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}
+-- 
+2.24.0
+