testserver/Spigot-Server-Patches/0057-Graduate-bungeecord-ch...

61 lines
1.9 KiB
Diff
Raw Normal View History

2016-11-17 02:23:38 +00:00
From 6fd537ae42b766ced6401fcaabe0c0ac6a1133e8 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
2016-02-29 23:09:49 +00:00
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
2016-11-17 02:23:38 +00:00
index 8e00881..7dfe30b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2016-11-17 02:23:38 +00:00
@@ -1312,6 +1312,18 @@ public final class CraftServer implements Server {
return count;
}
+ // Paper start
+ @Override
+ public void broadcast(BaseComponent component) {
2016-04-14 03:18:46 +00:00
+ this.spigot.broadcast(component);
+ }
+
+ @Override
+ public void broadcast(BaseComponent... components) {
2016-04-14 03:18:46 +00:00
+ 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
2016-11-17 02:23:38 +00:00
index 2a577d5..e0ec47f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2016-04-14 03:18:46 +00:00
@@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
+ // Paper start
+ @Override
+ public void sendMessage(BaseComponent component) {
2016-04-14 03:18:46 +00:00
+ this.spigot.sendMessage(component);
+ }
+
+ @Override
+ public void sendMessage(BaseComponent... components) {
2016-04-14 03:18:46 +00:00
+ this.spigot.sendMessage(components);
+ }
+
2016-04-14 03:18:46 +00:00
+ @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;
--
2016-11-17 02:23:38 +00:00
2.10.2