812618deba
Unintended side effects in recent versions, this patch has likely outlived its usefulness. Closes GH-452
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 5423c45e57cb9c46f271c7e80074460ef3438bad Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Thu, 3 Mar 2016 02:21:58 -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 c7cd3f7..b44808f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1317,6 +1317,18 @@ public final class CraftServer implements Server {
|
|
return count;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void broadcast(BaseComponent component) {
|
|
+ this.spigot.broadcast(component);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void broadcast(BaseComponent... components) {
|
|
+ this.spigot.broadcast(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 b05f111..70da218 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
}
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void sendMessage(BaseComponent component) {
|
|
+ this.spigot.sendMessage(component);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void sendMessage(BaseComponent... components) {
|
|
+ this.spigot.sendMessage(components);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent... components) {
|
|
+ this.spigot.sendMessage(position, components);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public String getDisplayName() {
|
|
return getHandle().displayName;
|
|
--
|
|
2.9.3
|
|
|