mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)

Browse source
This commit is contained in:
Noah van der Aa 2021-12-20 23:46:51 +01:00 • committed by GitHub
parent 6178609e1d
commit ae6fec6d13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
240 changed files with 435 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/api/0196-Add-Player-Client-Options-API.patch
View file

@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..f7f171c4ee0b8339b2f8fbe82442d65f
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b3e63a1a8a71b127735a05bc4938587fc0963c17..7f42df9683761ef022a2ff47915aca258158d633 100644
index ecebe470f4b3579a5af39a4dfa541a7e470de181..b349b2c2a7c70e57b4c28c8b540d01a2c0e62959 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@ -204,7 +204,7 @@ index b3e63a1a8a71b127735a05bc4938587fc0963c17..7f42df9683761ef022a2ff47915aca25
import com.destroystokyo.paper.Title; // Paper
import net.kyori.adventure.text.Component;
import com.destroystokyo.paper.profile.PlayerProfile; // Paper
@@ -2160,6 +2161,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2301,6 +2302,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the cooldown counter to 0, effectively starting the cooldown period.
*/
void resetCooldown();