testserver/Spigot-API-Patches/0014-Graduate-bungeecord-ch...

114 lines
3.8 KiB
Diff
Raw Normal View History

From 6ae06e8ef33f227d5099b96f19d474f27f51526d Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
2016-02-29 23:09:49 +00:00
Date: Mon, 29 Feb 2016 19:54:32 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
2016-04-16 16:23:37 +00: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 97dc7b22d..4571816c9 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -281,6 +281,26 @@ public final class Bukkit {
return server.broadcastMessage(message);
}
+ // Paper start
+ /**
2016-04-16 16:23:37 +00:00
+ * Sends the component to all online players.
+ *
2016-04-16 16:23:37 +00:00
+ * @param component the component to send
+ */
+ public static void broadcast(net.md_5.bungee.api.chat.BaseComponent component) {
+ server.broadcast(component);
+ }
+
+ /**
2016-04-16 16:23:37 +00:00
+ * Sends an array of components as a single message to all online players.
+ *
+ * @param components the components to send
+ */
+ public static void broadcast(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 4d00b141b..eb307395d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -229,6 +229,26 @@ public interface Server extends PluginMessageRecipient {
*/
public int broadcastMessage(String message);
+ // Paper start
+ /**
+ * Sends the component to all online players.
+ *
+ * @param component the component to send
+ */
2016-12-20 22:34:27 +00:00
+ public default void broadcast(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
+ */
2016-12-20 22:34:27 +00:00
+ public default void broadcast(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 be78cb64f..c763277d3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -428,6 +428,36 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMap(MapView map);
+ // Paper start
+ /**
+ * Sends the component to the player
+ *
+ * @param component the components to send
+ */
2016-12-20 22:34:27 +00:00
+ public default void sendMessage(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
+ */
2016-12-20 22:34:27 +00:00
+ public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
+ spigot().sendMessage(components);
+ }
2016-04-14 03:18:46 +00: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 22:34:27 +00: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.19.1