From 6d30840eb1f6e9f280401dcf1c2164464914e288 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 11 Jan 2020 12:57:21 -0500 Subject: [PATCH] Fixed #1358 --- core/src/mindustry/core/NetClient.java | 4 ++-- core/src/mindustry/entities/type/Player.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 8c12884472..cd9150c45d 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -133,9 +133,9 @@ public class NetClient implements ApplicationListener{ } //called on all clients - @Remote(called = Loc.server, targets = Loc.server, variants = Variant.both) + @Remote(targets = Loc.server, variants = Variant.both) public static void sendMessage(String message, String sender, Player playersender){ - if(Vars.ui != null && !(playersender != null && net.server() && sender.startsWith("[#" + player.getTeam().color.toString() + "]"))){ + if(Vars.ui != null){ Vars.ui.chatfrag.addMessage(message, sender); } diff --git a/core/src/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java index 79bb9a0bbd..d1046031ef 100644 --- a/core/src/mindustry/entities/type/Player.java +++ b/core/src/mindustry/entities/type/Player.java @@ -762,7 +762,6 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ public void sendMessage(String text){ if(isLocal){ if(Vars.ui != null){ - Log.info("add " + text); Vars.ui.chatfrag.addMessage(text, null); } }else{