Upstream update

This commit is contained in:
Bjarne Koll 2024-10-24 19:29:35 +02:00
parent fc05430719
commit 9047541397
No known key found for this signature in database
GPG key ID: 27F6CCCF55D2EE62
174 changed files with 468 additions and 468 deletions

View file

@ -224,10 +224,10 @@ index 0000000000000000000000000000000000000000..6cf6aa876278d0d3e75148608951fc58
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2435b7d14b52bbd47c4ddb7bdd6849acf42bffef..f4b1ed868a1fc8aa22fd07c3bf3aef886b8c8679 100644
index 80e894e3d625cde14bfe881d2c367b43a4882cfd..2d3c8febbbab959433101fb9dfc1e0ff9deca192 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3350,6 +3350,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3375,6 +3375,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
// Paper end - attack cooldown API