aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0010-Timings-v2.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2023-05-31 16:36:57 -0700
committerGitHub <[email protected]>2023-05-31 16:36:57 -0700
commitea0b63992c307cf5425ba7876d6b853ef3173b88 (patch)
treef36a493c0372d01c074f979cb5b7622649f800a8 /patches/api/0010-Timings-v2.patch
parentfa8fa1ce083521e7328dec8af97751d4bd9cebe6 (diff)
downloadPaper-ea0b63992c307cf5425ba7876d6b853ef3173b88.tar.gz
Paper-ea0b63992c307cf5425ba7876d6b853ef3173b88.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 4727d326 Don't let Sign extend SignSide, mark API as experimental 9b29bdcc PR-845: Add preliminary support for multi sided signs CraftBukkit Changes: b346a5f6d PR-1170: Add preliminary support for multi sided signs 86c816189 Update SQLite version d9324b4bc Fix addition of custom smithing trim / transform recipes Spigot Changes: 7d7b241e Rebuild patches
Diffstat (limited to 'patches/api/0010-Timings-v2.patch')
-rw-r--r--patches/api/0010-Timings-v2.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch
index 668d38988c..8f276765b8 100644
--- a/patches/api/0010-Timings-v2.patch
+++ b/patches/api/0010-Timings-v2.patch
@@ -3455,10 +3455,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8708ca080bda0f4ec43964db3a4e56cf73c6559a..28f27988d22c0f38b520273920a9965d64107569 100644
+index 4190d5b3b3d3eb9525ed342179cb827cc5590e3b..3fffe6844d5f113f13ae3e2636efd7a8f43940dd 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2143,7 +2143,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2154,7 +2154,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated // Paper
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");