more cleanup and resource pack api fixes

1 files changed, 10 insertions, 9 deletions

diff --git a/patches/api/0190-Add-Player-Client-Options-API.patch b/patches/api/0190-Add-Player-Client-Options-API.patch
index 1d1189fbe0..3f4764cbba 100644
--- a/patches/api/0190-Add-Player-Client-Options-API.patch
+++ b/patches/api/0190-Add-Player-Client-Options-API.patch
@@ -229,19 +229,20 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1afa65152f56e42793cb53a049e06b16eabe2ce4..cf2090ee92e7245c028a0e625cdb483665b3821f 100644
+index 716b2023ee3e03a70f0afc0c26558fc0a2ee356b..1e52cc88dc47f2494af505d92ebe56f79780a099 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2980,6 +2980,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * Reset the cooldown counter to 0, effectively starting the cooldown period.
-      */
+@@ -3050,6 +3050,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void resetCooldown();
-+
+     // Paper end - attack cooldown API
+ 
++    // Paper start - client option API
 +    /**
 +     * @return the client option value of the player
 +     */
-+    @NotNull
-+    <T> T getClientOption(@NotNull com.destroystokyo.paper.ClientOption<T> option);
-     // Paper end
- 
++    <T> @NotNull T getClientOption(com.destroystokyo.paper.@NotNull ClientOption<T> option);
++    // Paper end - client option API
++
      // Spigot start
+     public class Spigot extends Entity.Spigot {
+