mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
ada930bf8d
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: cfd18bd0 SPIGOT-6436: Add Player#stopAllSounds CraftBukkit Changes: b58f4299 SPIGOT-6436: Add Player#stopAllSounds eb191612 SPIGOT-6783: Items do not appear in custom anvil inventories 376edf4f SPIGOT-6779: Fix LivingEntity#attack for Player entities 747a73ec SPIGOT-6772: Use entity mailbox and re-schedule entities if they get unloaded
124 lines
4.9 KiB
Diff
124 lines
4.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Mon, 29 Feb 2016 19:54:32 -0600
|
|
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
|
|
|
Change Javadoc to be accurate
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 3d83ecdb09d8f853583d11da2b02b5d80ef25360..ca1a9c1ac6f9716435c6bc7858acce36785fdbe5 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -310,6 +310,30 @@ public final class Bukkit {
|
|
return server.broadcastMessage(message);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sends the component to all online players.
|
|
+ *
|
|
+ * @param component the component to send
|
|
+ * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
|
+ server.broadcast(component);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to all online players.
|
|
+ *
|
|
+ * @param components the components to send
|
|
+ * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ server.broadcast(components);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the name of the update folder. The update folder is used to safely
|
|
* update plugins at the right moment on a plugin load.
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 833be0b61a375cef5b53e8a35dc2a99bebd550ef..4db7cffbc1baaaece076cedb55aff07f7e5ab379 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -255,6 +255,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
@Deprecated // Paper
|
|
public int broadcastMessage(@NotNull String message);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sends the component to all online players.
|
|
+ *
|
|
+ * @param component the component to send
|
|
+ * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
|
+ spigot().broadcast(component);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to all online players.
|
|
+ *
|
|
+ * @param components the components to send
|
|
+ * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ spigot().broadcast(components);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the name of the update folder. The update folder is used to safely
|
|
* update plugins at the right moment on a plugin load.
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index a351a6aeff52a406cae686e4525bea1d25285895..c629a7acd5ff2950165bc672d1e4a5850dcce1ec 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -715,6 +715,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
*/
|
|
public void sendMap(@NotNull MapView map);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sends the component to the player
|
|
+ *
|
|
+ * @param component the components to send
|
|
+ * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
+ */
|
|
+ @Override
|
|
+ @Deprecated
|
|
+ public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
|
+ spigot().sendMessage(component);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to the player
|
|
+ *
|
|
+ * @param components the components to send
|
|
+ * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
+ */
|
|
+ @Override
|
|
+ @Deprecated
|
|
+ public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ spigot().sendMessage(components);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to the specified screen position of this player
|
|
+ *
|
|
+ * @param position the screen position
|
|
+ * @param components the components to send
|
|
+ */
|
|
+ public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ spigot().sendMessage(position, components);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Forces an update of the player's entire inventory.
|
|
*
|