PaperMC/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

116 lines
3.9 KiB
Diff
Raw Normal View History

From a5c0d8758c2a44b94be4d8d868c1eac0b2f30e46 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
2016-03-01 00:09:49 +01:00
Date: Mon, 29 Feb 2016 19:54:32 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
2016-04-16 18:23:37 +02:00
Change Javadoc to be accurate
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6b951d5ad..39423f3a6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -274,6 +274,26 @@ public final class Bukkit {
return server.broadcastMessage(message);
}
+ // Paper start
+ /**
2016-04-16 18:23:37 +02:00
+ * Sends the component to all online players.
+ *
2016-04-16 18:23:37 +02:00
+ * @param component the component to send
+ */
+ public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
+ server.broadcast(component);
+ }
+
+ /**
2016-04-16 18:23:37 +02:00
+ * Sends an array of components as a single message to all online players.
+ *
+ * @param components the components to send
+ */
+ 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 af21bb1aa..b09d01085 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient {
*/
public int broadcastMessage(@NotNull String message);
+ // Paper start
+ /**
+ * Sends the component to all online players.
+ *
+ * @param component the component to send
+ */
+ public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
2016-12-20 23:34:27 +01:00
+ spigot().broadcast(component);
+ }
+
+ /**
+ * Sends an array of components as a single message to all online players.
+ *
+ * @param components the components to send
+ */
+ public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
2016-12-20 23:34:27 +01:00
+ 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 a985431e5..dd6adedb6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -441,6 +441,38 @@ 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
+ */
+ @Override
+ public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
2016-12-20 23:34:27 +01:00
+ spigot().sendMessage(component);
+ }
+
+ /**
+ * Sends an array of components as a single message to the player
+ *
+ * @param components the components to send
+ */
+ @Override
+ public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
2016-12-20 23:34:27 +01:00
+ spigot().sendMessage(components);
+ }
2016-04-14 05:18:46 +02:00
+
+ /**
+ * 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
+ */
2016-12-20 23:34:27 +01:00
+ 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.
*
--
2.26.2