Remove tick times api (was moved upstream to paper)

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

@@ -1,69 +0,0 @@
-From 190a3d3ef1cd3a3444da5965a8230f44883ebcd3 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 | 21 +++++++++++++++++++++
- src/main/java/org/bukkit/Server.java | 17 +++++++++++++++++
- 2 files changed, 38 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9cac2d299..14e85ac6c 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1692,4 +1692,25 @@ public final class Bukkit {
-     public static Server.Spigot spigot() {
-         return server.spigot();
-     }
-+
-+    // Purpur start
-+    /**
-+     * Get a sample of the servers last tick times (in nanos)
-+     * 
-+     * @return A sample of the servers last tick times (in nanos)
-+     */
-+    @NotNull
-+    public static long[] getTickTimes() {
-+        return server.getTickTimes();
-+    }
-+
-+    /**
-+     * Get the average tick time (in millis)
-+     *
-+     * @return Average tick time (in millis)
-+     */
-+    public static double getAverageTickTime() {
-+        return server == null ? 0D : server.getAverageTickTime();
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8f16fb0cb..90b439071 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1487,4 +1487,21 @@ public interface Server extends PluginMessageRecipient {
-      */
-     boolean isStopping();
-     // Paper end
-+
-+    // Purpur start
-+    /**
-+     * Get a sample of the servers last tick times (in nanos)
-+     *
-+     * @return A sample of the servers last tick times (in nanos)
-+     */
-+    @NotNull
-+    long[] getTickTimes();
-+
-+    /**
-+     * Get the average tick time (in millis)
-+     *
-+     * @return Average tick time (in millis)
-+     */
-+    double getAverageTickTime();
-+    // Purpur end
- }
--- 
-2.24.0
-

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

@@ -1,21 +1,23 @@
-From d4f6fbd999d628857801e5d9a405ee5b010e9ab5 Mon Sep 17 00:00:00 2001
+From 3635012280c234231d996c604d2ec76269c67dd7 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 | 9 +++++++++
- src/main/java/org/bukkit/Server.java | 7 +++++++
- 2 files changed, 16 insertions(+)
+ 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 14e85ac6c..ce82eadb5 100644
+index 9cac2d299..cd6c2f7ca 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1694,6 +1694,15 @@ public final class Bukkit {
+@@ -1692,4 +1692,15 @@ public final class Bukkit {
+     public static Server.Spigot spigot() {
+         return server.spigot();
      }
- 
-     // Purpur start
++
++    // Purpur start
 +    /**
 +     * Get the name of this server
 +     * @return the name of the server
@@ -24,28 +26,26 @@ index 14e85ac6c..ce82eadb5 100644
 +    public static String getServerName() {
 +        return server.getServerName();
 +    }
-+
-     /**
-      * Get a sample of the servers last tick times (in nanos)
-      * 
++    // Purpur end
+ }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 90b439071..d2a3114eb 100644
+index 8f16fb0cb..60d85e233 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1489,6 +1489,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1487,4 +1487,13 @@ public interface Server extends PluginMessageRecipient {
+      */
+     boolean isStopping();
      // Paper end
- 
-     // Purpur start
++
++    // Purpur start
 +    /**
 +     * Get the name of this server
 +     * @return the name of the server
 +     */
 +    @NotNull
 +    String getServerName();
-+
-     /**
-      * Get a sample of the servers last tick times (in nanos)
-      *
++    // Purpur end
+ }
 -- 
 2.24.0
 

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

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

patches/api/0011-Add-ExecuteCommandEvent.patch

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

patches/api/0012-Implement-ChunkTooLargeEvent.patch

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

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

@@ -1,4 +1,4 @@
-From 8cb6d31ea7c41a44a0f02f130c259613b7a384b5 Mon Sep 17 00:00:00 2001
+From 2631d1fdbeb89f1f261a0ce8480bd2c385d8d5d2 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,13 +9,14 @@ 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 ce82eadb5..013e3b2d1 100644
+index cd6c2f7ca..151de5c86 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1703,6 +1703,15 @@ public final class Bukkit {
+@@ -1702,5 +1702,14 @@ public final class Bukkit {
+     public static String getServerName() {
          return server.getServerName();
      }
- 
++
 +    /**
 +     * Check if server is lagging according to laggy threshold setting
 +     *
@@ -24,28 +25,25 @@ index ce82eadb5..013e3b2d1 100644
 +    public static boolean isLagging() {
 +        return server.isLagging();
 +    }
-+
-     /**
-      * Get a sample of the servers last tick times (in nanos)
-      * 
+     // Purpur end
+ }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d2a3114eb..a185f2473 100644
+index 60d85e233..a013eb2b9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1496,6 +1496,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1495,5 +1495,12 @@ public interface Server extends PluginMessageRecipient {
+      */
      @NotNull
      String getServerName();
- 
++
 +    /**
 +     * Check if server is lagging according to laggy threshold setting
 +     *
 +     * @return True if lagging
 +     */
 +    boolean isLagging();
-+
-     /**
-      * Get a sample of the servers last tick times (in nanos)
-      *
+     // Purpur end
+ }
 -- 
 2.24.0
 

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

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

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

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

patches/api/0016-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

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

patches/api/0017-Add-MonsterEggSpawnEvent.patch

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

patches/api/0018-Add-ThrownEggHatchEvent.patch

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 61ba17cba901baddbda5f01637ba70794bfec56e Mon Sep 17 00:00:00 2001
+From 9781735cd943b5c4b202fd3ea32acf628fc6e492 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

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

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

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

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

patches/api/0027-Add-LootableInventoryFirstFillEvent.patch

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

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

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

patches/api/0029-Implement-EntityMoveEvent.patch

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

patches/api/0030-Add-ItemStack-convenience-methods.patch

@@ -1,4 +1,4 @@
-From b3b7f97f200830c69b6c15642184e16b93b795ad Mon Sep 17 00:00:00 2001
+From 78465fa5b6604ac86838560ff7f3ee8e3c0f57ee Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Mar 2020 20:52:12 -0500
 Subject: [PATCH] Add ItemStack convenience methods

patches/api/0031-Add-BellRingEvent.patch

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

patches/api/0032-Configurable-enchantment-max-level.patch

@@ -1,4 +1,4 @@
-From 6d7f676b7f8b78017aae8671972c1fcaf6a92b0b Mon Sep 17 00:00:00 2001
+From 05f331fbdeffe82858cc827f452ca3458108921e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Apr 2020 19:18:29 -0500
 Subject: [PATCH] Configurable enchantment max level

patches/api/0033-Async-support-for-PlayerCommandSendEvent.patch

@@ -1,4 +1,4 @@
-From 9ee7fd3e6d4a5bb6f32219311e885342246eb60c Mon Sep 17 00:00:00 2001
+From 8ae43d0e8a4016625c43f34562c27132c02cb04d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 8 Apr 2020 23:00:31 -0500
 Subject: [PATCH] Async support for PlayerCommandSendEvent