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/0025-Complete-resource-pack-API.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1df2ff828aee7dac50d63fe1d51104e9fb2ed264..9884b8eefea0cc84a1af5901410d77746f85b5d7 100644
index 70e97db83071935dfe6cbf2a60660672d0205a96..8fa4606e187b4677d2302b4fec5c02adf652b3e5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1251,7 +1251,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -18,7 +18,7 @@ index 1df2ff828aee7dac50d63fe1d51104e9fb2ed264..9884b8eefea0cc84a1af5901410d7774
public void setResourcePack(@NotNull String url);
/**
@@ -1788,6 +1790,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1929,6 +1931,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
}