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

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

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
This can be useful for changing name or skins after a player has logged in.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1e3a56ff656cdfe18cf665eecd8f126275f29715..f7aeb7aca3bf3929d1a8751928318ff6c7da96f6 100644
index 4485542bcf3014364c2920026a07da6194d6ba29..1c3b5b1950b8b2cb660e160e455384780f2d4e75 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4,6 +4,7 @@ import java.net.InetSocketAddress;
@ -17,7 +17,7 @@ index 1e3a56ff656cdfe18cf665eecd8f126275f29715..f7aeb7aca3bf3929d1a8751928318ff6
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -1965,6 +1966,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2106,6 +2107,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
*/
boolean hasResourcePack();