2020-05-06 17:48:49 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2016-02-17 09:55:05 +08:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
2016-03-01 07:09:49 +08:00
|
|
|
Date: Mon, 29 Feb 2016 19:54:32 -0600
|
2016-02-17 09:55:05 +08:00
|
|
|
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
|
|
|
|
2016-04-17 00:23:37 +08:00
|
|
|
Change Javadoc to be accurate
|
2016-02-17 09:55:05 +08:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
2020-12-13 08:42:05 +08:00
|
|
|
index 4747afa841b4fa71328c480f836f9fefb2e0c118..dcb3af5a6d4fedcb805928223e40c74fbea894a0 100644
|
2016-02-17 09:55:05 +08:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2020-12-13 08:42:05 +08:00
|
|
|
@@ -283,6 +283,26 @@ public final class Bukkit {
|
2016-02-17 09:55:05 +08:00
|
|
|
return server.broadcastMessage(message);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
2016-04-17 00:23:37 +08:00
|
|
|
+ * Sends the component to all online players.
|
2016-02-17 09:55:05 +08:00
|
|
|
+ *
|
2016-04-17 00:23:37 +08:00
|
|
|
+ * @param component the component to send
|
2016-02-17 09:55:05 +08:00
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
2016-02-17 09:55:05 +08:00
|
|
|
+ server.broadcast(component);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
2016-04-17 00:23:37 +08:00
|
|
|
+ * Sends an array of components as a single message to all online players.
|
2016-02-17 09:55:05 +08:00
|
|
|
+ *
|
|
|
|
+ * @param components the components to send
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
2016-02-17 09:55:05 +08:00
|
|
|
+ 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
|
2020-12-13 08:42:05 +08:00
|
|
|
index 1f8095141bdbfabb1e487d93f33f636e83084386..00738355e42704de583b60833d4fb39a8728e762 100644
|
2016-02-17 09:55:05 +08:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2020-12-13 08:42:05 +08:00
|
|
|
@@ -232,6 +232,26 @@ public interface Server extends PluginMessageRecipient {
|
2016-02-17 09:55:05 +08:00
|
|
|
*/
|
2019-03-20 08:28:15 +08:00
|
|
|
public int broadcastMessage(@NotNull String message);
|
2016-02-17 09:55:05 +08:00
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
2016-04-18 02:35:31 +08:00
|
|
|
+ * Sends the component to all online players.
|
2016-02-17 09:55:05 +08:00
|
|
|
+ *
|
2016-04-18 02:35:31 +08:00
|
|
|
+ * @param component the component to send
|
2016-02-17 09:55:05 +08:00
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
2016-12-21 06:34:27 +08:00
|
|
|
+ spigot().broadcast(component);
|
|
|
|
+ }
|
2016-02-17 09:55:05 +08:00
|
|
|
+
|
|
|
|
+ /**
|
2016-04-18 02:35:31 +08:00
|
|
|
+ * Sends an array of components as a single message to all online players.
|
2016-02-17 09:55:05 +08:00
|
|
|
+ *
|
|
|
|
+ * @param components the components to send
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
2016-12-21 06:34:27 +08:00
|
|
|
+ spigot().broadcast(components);
|
|
|
|
+ }
|
2016-02-17 09:55:05 +08:00
|
|
|
+ // 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
|
2020-11-03 17:14:21 +08:00
|
|
|
index ff46ea6aa545c910acaa7e5a7690e88e0129608c..695d80d8aabdbb4a6553d5446a8f7ea766b52472 100644
|
2016-02-17 09:55:05 +08:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
2020-11-03 17:14:21 +08:00
|
|
|
@@ -482,6 +482,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2016-02-17 09:55:05 +08:00
|
|
|
*/
|
2019-03-20 08:28:15 +08:00
|
|
|
public void sendMap(@NotNull MapView map);
|
2016-02-17 09:55:05 +08:00
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Sends the component to the player
|
|
|
|
+ *
|
|
|
|
+ * @param component the components to send
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @Override
|
|
|
|
+ public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
2016-12-21 06:34:27 +08:00
|
|
|
+ spigot().sendMessage(component);
|
|
|
|
+ }
|
2016-02-17 09:55:05 +08:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sends an array of components as a single message to the player
|
|
|
|
+ *
|
|
|
|
+ * @param components the components to send
|
|
|
|
+ */
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @Override
|
|
|
|
+ public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
2016-12-21 06:34:27 +08:00
|
|
|
+ spigot().sendMessage(components);
|
|
|
|
+ }
|
2016-04-14 11:18:46 +08: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-21 06:34:27 +08:00
|
|
|
+ public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
|
|
+ spigot().sendMessage(position, components);
|
|
|
|
+ }
|
2016-02-17 09:55:05 +08:00
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Forces an update of the player's entire inventory.
|
|
|
|
*
|