From 6218fda201060ead8d010f79c663a140b771a8f6 Mon Sep 17 00:00:00 2001
From: Misterzym <sav@net-bit.ru>
Date: Thu, 11 Oct 2018 12:00:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BC=20=D0=B8=20=D1=84=D0=B8=D0=BA=D1=81=D0=B8?=
 =?UTF-8?q?=D0=BC=20=D0=B1=D0=B0=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ru/upworld/chat/ChatListener.java | 15 ++++++++-------
 src/ru/upworld/chat/CommandMsg.java   | 16 ++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/ru/upworld/chat/ChatListener.java b/src/ru/upworld/chat/ChatListener.java
index a3e9f4b..0d0a5d8 100644
--- a/src/ru/upworld/chat/ChatListener.java
+++ b/src/ru/upworld/chat/ChatListener.java
@@ -17,20 +17,21 @@ public class ChatListener implements Listener {
         String message = e.getMessage();
         Player player = e.getPlayer();
         String formated = ChatUtil.translateColorCodes(formatLocal);
-        Chat chat = message.startsWith("!") ? Chat.LOCAL : Chat.GLOBAL;
+        Chat chat = message.startsWith("!") ? Chat.GLOBAL : Chat.LOCAL;
+
         if (chat == Chat.LOCAL) {
+            e.getRecipients().clear();
             Bukkit.getOnlinePlayers().stream().filter((p) -> (p.getLocation().distance(player.getLocation()) <= 100)).forEachOrdered((p) -> {
-                e.getRecipients().clear();
                 e.getRecipients().add(p);
             });
         } else {
-            message = message.replaceFirst("!", "");
+            e.setMessage(message.replaceFirst("!", ""));
+            formated = ChatUtil.translateColorCodes(formatGlobl);
+            
         }
         formated = formated.replace("%chatPrefix", chat.getPrefix());
-        formated = formated.replace(" ", "");
-        formated = formated.replace(":", ": ");
-        formated = formated.replace("%player", player.getDisplayName());
-        formated = formated.replace("%message", message);
+        formated = formated.replace("%message", "%2$s").replace("%player", "%1$s");
+        System.out.println(formated);
         e.setFormat(formated);
     }
 
diff --git a/src/ru/upworld/chat/CommandMsg.java b/src/ru/upworld/chat/CommandMsg.java
index 5b0b999..425eceb 100644
--- a/src/ru/upworld/chat/CommandMsg.java
+++ b/src/ru/upworld/chat/CommandMsg.java
@@ -25,19 +25,15 @@ public class CommandMsg implements CommandExecutor {
             sender.sendMessage(noMessage);
             return true;
         }
-        boolean exist = false;
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            if (player.getName().equals(args[0])) {
-                exist = true;
-            }
-        }
-        if (!exist) {
+        Player pl = Bukkit.getPlayer(args[0]);
+        if (pl == null) {
             sender.sendMessage(playerIsOffline);
             return true;
+        } else {
+            sender.sendMessage(ChatUtil.translateColorCodes(formatPrivateSend.replace("{NAME}", args[0])) + joiner(args));
+            pl.sendMessage(ChatUtil.translateColorCodes(formatPrivateMe.replace("{NAME}", sender.getName())) + joiner(args));
+            UpWorldChat.log(ChatUtil.translateColorCodes(formatPrivateMe.replace("{NAME}", sender.getName())) + joiner(args));
         }
-        sender.sendMessage(ChatUtil.translateColorCodes(formatPrivateSend.replace("{NAME}", args[0])) + joiner(args));
-        Bukkit.getPlayer(args[0]).sendMessage(ChatUtil.translateColorCodes(formatPrivateMe.replace("{NAME}", sender.getName())) + joiner(args));
-        UpWorldChat.log(ChatUtil.translateColorCodes(formatPrivateMe.replace("{NAME}", sender.getName())) + joiner(args));
         return true;
     }