116 lines
3.9 KiB
Diff
116 lines
3.9 KiB
Diff
From 6bc816b2ea026b0d07a19fa4bb3453c03ed421e6 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 3a80f2e29..e27bdb7bf 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -302,6 +302,26 @@ public final class Bukkit {
|
|
return server.broadcastMessage(message);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sends the component to all online players.
|
|
+ *
|
|
+ * @param component the component to send
|
|
+ */
|
|
+ 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
|
|
+ */
|
|
+ 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 4c3156071..ab0438b81 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -249,6 +249,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) {
|
|
+ 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) {
|
|
+ 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 51a145a4a..5a741b41e 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -421,6 +421,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) {
|
|
+ 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) {
|
|
+ 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.
|
|
*
|
|
--
|
|
2.21.0
|
|
|