merge some patches & re-enable timings

patches/api/0005-Purpur-client-support.patch

@@ -1,24 +1,24 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Fredthedoggy <45927799+fredthedoggy@users.noreply.github.com>
 Date: Thu, 19 Aug 2021 20:04:18 -0400
-Subject: [PATCH] Add usesPurpurClient() to Purpur-API
+Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 42c9911885b1323032cc14c737c562695692744c..2303dea99e6243443a7c0a33f72892eedc118e2c 100644
+index c87cb640dc829a266e85e97a2e3bb2f0f52a2eaa..fa4147d4dc36e7f442587428c66e2378511ea6b0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2442,5 +2442,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
-      */
-     public boolean hasFlyingFallDamage();
+@@ -2299,4 +2299,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     @Override
+     Spigot spigot();
+     // Spigot end
 +
++    // Purpur start
 +    /**
 +     * Allows you to get if player uses Purpur Client
 +     *
 +     * @return True if Player uses Purpur Client
 +     */
 +    public boolean usesPurpurClient();
-+
-     // Purpur end
++    // Purpur end
  }

patches/api/0011-AFK-API.patch

@@ -81,15 +81,14 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c87cb640dc829a266e85e97a2e3bb2f0f52a2eaa..285c8a5c6991c26e0b9c2b6af252cc1b320a8a2f 100644
+index fa4147d4dc36e7f442587428c66e2378511ea6b0..841e7d45b8cefee0cc9fbca1977ea007f446d824 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2299,4 +2299,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     @Override
-     Spigot spigot();
-     // Spigot end
+@@ -2307,5 +2307,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @return True if Player uses Purpur Client
+      */
+     public boolean usesPurpurClient();
 +
-+    // Purpur start
 +    /**
 +     * Check if player is AFK
 +     *
@@ -108,5 +107,5 @@ index c87cb640dc829a266e85e97a2e3bb2f0f52a2eaa..285c8a5c6991c26e0b9c2b6af252cc1b
 +     * Reset the idle timer back to 0
 +     */
 +    void resetIdleTimer();
-+    // Purpur end
+     // Purpur end
  }

patches/api/0020-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ 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 285c8a5c6991c26e0b9c2b6af252cc1b320a8a2f..702b2cb940fd269c4ddc0c25c7aefd00d014b942 100644
+index 841e7d45b8cefee0cc9fbca1977ea007f446d824..b59a297a9eb21f0e7d70d9662fd7c0e0080ff3e1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2319,5 +2319,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2326,5 +2326,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0034-Fix-javadoc-warnings-missing-param-and-return.patch

@@ -949,7 +949,7 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
  
          NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 702b2cb940fd269c4ddc0c25c7aefd00d014b942..3fc740eca60e4d21c13f1a4495f84ec765c007c9 100644
+index b59a297a9eb21f0e7d70d9662fd7c0e0080ff3e1..89345f789bb6f5e87463f423c69f1fb8a350bfaa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2121,6 +2121,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0040-Conflict-on-change-for-adventure-deprecations.patch

@@ -170,7 +170,7 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3fc740eca60e4d21c13f1a4495f84ec765c007c9..6c540b0c74ba6f4fe8a1ff35db24050b78775fc3 100644
+index 89345f789bb6f5e87463f423c69f1fb8a350bfaa..cce3d28121c89411e0acc4a8d45a624395a0ac85 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0044-Flying-Fall-Damage-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6c540b0c74ba6f4fe8a1ff35db24050b78775fc3..8f132156ca772c651648de5333152e1b50adecb8 100644
+index cce3d28121c89411e0acc4a8d45a624395a0ac85..8748199736a288f602e4cf5fb5ac4a08278f38b9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2345,5 +2345,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2352,5 +2352,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

patches/api/0049-Add-force-and-prompt-parameters-to-resource-pack-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8f132156ca772c651648de5333152e1b50adecb8..42c9911885b1323032cc14c737c562695692744c 100644
+index 8748199736a288f602e4cf5fb5ac4a08278f38b9..743883f3d95b94a58ed7826dd74b3f37be9aecb9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1490,6 +1490,89 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM