From 06fd77595fda1e2a352ab7edc7025b18e404eb39 Mon Sep 17 00:00:00 2001
From: Ashcon Partovi <ashcon@partovi.net>
Date: Tue, 22 May 2018 15:35:46 -0700
Subject: [PATCH] Only show admin chat server when message is remote

---
 .../java/tc/oc/api/docs/virtual/ChatDoc.java     |  1 -
 .../bukkit/channels/admin/AdminChannel.java      | 16 +++++++---------
 .../tc/oc/commons/bukkit/chat/ChatCreator.java   |  1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/API/api/src/main/java/tc/oc/api/docs/virtual/ChatDoc.java b/API/api/src/main/java/tc/oc/api/docs/virtual/ChatDoc.java
index 00ba660..aac2c7c 100644
--- a/API/api/src/main/java/tc/oc/api/docs/virtual/ChatDoc.java
+++ b/API/api/src/main/java/tc/oc/api/docs/virtual/ChatDoc.java
@@ -34,7 +34,6 @@ public interface ChatDoc {
     @Serialize
     interface Complete extends Base {
         @Nullable PlayerId sender();
-        @Serialize(false) default boolean local() { return false; }
     }
 
     enum Type {
diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java
index 842c7ec..c8e79ee 100644
--- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java
+++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java
@@ -38,11 +38,13 @@ public class AdminChannel extends SimpleChannel implements PermissibleChannel {
 
     private final SettingManagerProvider settings;
     private final PermissionRegistry permissions;
+    private final Server localServer;
     private final ServerStore serverStore;
 
-    @Inject AdminChannel(PermissionRegistry permissions, SettingManagerProvider settings, ServerStore serverStore) {
+    @Inject AdminChannel(PermissionRegistry permissions, SettingManagerProvider settings, Server localServer, ServerStore serverStore) {
         this.settings = settings;
         this.permissions = permissions;
+        this.localServer = localServer;
         this.serverStore = serverStore;
     }
 
@@ -70,16 +72,12 @@ public class AdminChannel extends SimpleChannel implements PermissibleChannel {
 
     @Override
     public BaseComponent format(Chat chat, PlayerComponent player, String message) {
-        BaseComponent stub;
-        if(chat.local()) {
-            stub = player;
-        } else {
+        Component component = new Component();
+        if(!localServer._id().equals(chat.server_id())) {
             final Server server = serverStore.byId(chat.server_id());
-            stub = ServerFormatter.light.nameWithDatacenter(server);
-            stub.addExtra(" ");
-            stub.addExtra(player);
+            component.extra(ServerFormatter.light.nameWithDatacenter(server)).extra(" ");
         }
-        return new Component(stub).extra(": ").extra(message);
+        return component.extra(player).extra(": ").extra(message);
     }
 
     @Override
diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java
index a344e95..bbbdc17 100644
--- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java
+++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java
@@ -85,7 +85,6 @@ public class ChatCreator implements PluginFacet, Listener {
             public ChatDoc.Type type() { return chat.type(); }
             public Instant sent_at() { return chat.sent_at(); }
             public ChatDoc.Broadcast broadcast() { return chat.broadcast(); }
-            public boolean local() { return true; }
         };
     }