Move bungeecord chat APIs out of spigot subclasses
This commit is contained in:
parent
752ba5c528
commit
52398f034c
@ -0,0 +1,94 @@
|
|||||||
|
From 0cedba608ed4c22ed465f612d48437ec5955953b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
|
Date: Tue, 16 Feb 2016 19:15:30 -0600
|
||||||
|
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||||
|
index f0e1b99..8fbc828 100644
|
||||||
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||||
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||||
|
@@ -292,6 +292,26 @@ public final class Bukkit {
|
||||||
|
return server.broadcastMessage(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ /**
|
||||||
|
+ * Sends the component to the player
|
||||||
|
+ *
|
||||||
|
+ * @param component the components to send
|
||||||
|
+ */
|
||||||
|
+ public static void broadcast(net.md_5.bungee.api.chat.BaseComponent component) {
|
||||||
|
+ server.broadcast(component);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sends an array of components as a single message to the player
|
||||||
|
+ *
|
||||||
|
+ * @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 316336d..1b62463 100644
|
||||||
|
--- a/src/main/java/org/bukkit/Server.java
|
||||||
|
+++ b/src/main/java/org/bukkit/Server.java
|
||||||
|
@@ -238,6 +238,22 @@ public interface Server extends PluginMessageRecipient {
|
||||||
|
*/
|
||||||
|
public int broadcastMessage(String message);
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ /**
|
||||||
|
+ * Sends the component to the player
|
||||||
|
+ *
|
||||||
|
+ * @param component the components to send
|
||||||
|
+ */
|
||||||
|
+ public void broadcast(net.md_5.bungee.api.chat.BaseComponent component);
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sends an array of components as a single message to the player
|
||||||
|
+ *
|
||||||
|
+ * @param components the components to send
|
||||||
|
+ */
|
||||||
|
+ public void broadcast(net.md_5.bungee.api.chat.BaseComponent... 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 c0ebe65..9ebfa47 100644
|
||||||
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
|
@@ -330,6 +330,22 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
|
*/
|
||||||
|
public void sendMap(MapView map);
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ /**
|
||||||
|
+ * Sends the component to the player
|
||||||
|
+ *
|
||||||
|
+ * @param component the components to send
|
||||||
|
+ */
|
||||||
|
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component);
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sends an array of components as a single message to the player
|
||||||
|
+ *
|
||||||
|
+ * @param components the components to send
|
||||||
|
+ */
|
||||||
|
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components);
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* Forces an update of the player's entire inventory.
|
||||||
|
*
|
||||||
|
--
|
||||||
|
2.7.1
|
||||||
|
|
@ -0,0 +1,63 @@
|
|||||||
|
From 028031b3dbc859705ebe333feaf5e955448fcaa8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
|
Date: Tue, 16 Feb 2016 19:15:30 -0600
|
||||||
|
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
|
index 7b8fdc3..69485fa 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
|
@@ -1311,6 +1311,22 @@ public final class CraftServer implements Server {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ @Override
|
||||||
|
+ public void broadcast(BaseComponent component) {
|
||||||
|
+ for (Player player : getOnlinePlayers()) {
|
||||||
|
+ player.sendMessage(component);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public void broadcast(BaseComponent... components) {
|
||||||
|
+ for (Player player : getOnlinePlayers()) {
|
||||||
|
+ player.sendMessage(components);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
@Override
|
||||||
|
@Deprecated
|
||||||
|
public OfflinePlayer getOfflinePlayer(String name) {
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
index e8c6d5e..dba0520 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
@@ -162,6 +162,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ @Override
|
||||||
|
+ public void sendMessage(BaseComponent component) {
|
||||||
|
+ sendMessage(new BaseComponent[]{component});
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public void sendMessage(BaseComponent... components) {
|
||||||
|
+ if (getHandle().playerConnection == null) return;
|
||||||
|
+
|
||||||
|
+ PacketPlayOutChat packet = new PacketPlayOutChat();
|
||||||
|
+ packet.components = components;
|
||||||
|
+ getHandle().playerConnection.sendPacket(packet);
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
@Override
|
||||||
|
public String getDisplayName() {
|
||||||
|
return getHandle().displayName;
|
||||||
|
--
|
||||||
|
2.7.1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user