From c7ef67b8af39847360ea704708e2e2b7ff5e5c38 Mon Sep 17 00:00:00 2001
From: Misterzym <sav@net-bit.ru>
Date: Thu, 11 Oct 2018 11:53:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=88=D0=BD=D0=B5=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugin.yml                        |  3 +--
 src/ru/upworld/chat/ChatListener.java |  5 +----
 src/ru/upworld/chat/HideStream.java   | 26 --------------------------
 src/ru/upworld/chat/UpWorldChat.java  |  1 -
 4 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 src/ru/upworld/chat/HideStream.java

diff --git a/src/plugin.yml b/src/plugin.yml
index 08843e3..685f074 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -3,8 +3,7 @@ main: ru.upworld.chat.UpWorldChat
 description: Chat plugin
 author: NeonGC
 version: 1.13
-softdepend: []
 commands:
   msg:
     description: 'Private message command'
-    aliases: [m, м, ьып]
\ No newline at end of file
+    aliases: [m]
\ No newline at end of file
diff --git a/src/ru/upworld/chat/ChatListener.java b/src/ru/upworld/chat/ChatListener.java
index eb49b54..4531e61 100644
--- a/src/ru/upworld/chat/ChatListener.java
+++ b/src/ru/upworld/chat/ChatListener.java
@@ -16,9 +16,6 @@ public class ChatListener implements Listener {
         String message = e.getMessage();
         Player player = e.getPlayer();
         String formated = ChatUtil.translateColorCodes(format);
-        if (message.startsWith("%tcc%") && player.hasPermission("upworld.translateColorCodes")) {
-            message = ChatUtil.translateColorCodes(message).replace("%tcc%", "");
-        }
         Chat chat = message.startsWith("!") ? Chat.LOCAL : Chat.GLOBAL;
         if (chat == Chat.LOCAL) {
             Bukkit.getOnlinePlayers().stream().filter((p) -> (p.getLocation().distance(player.getLocation()) <= 100)).forEachOrdered((p) -> {
@@ -37,7 +34,7 @@ public class ChatListener implements Listener {
     }
 
     public enum Chat {
-        GLOBAL("§9[§6G§9]§f "), LOCAL("§9[§aL§9]§f ");
+        GLOBAL("§9[§6G§9]§f "), LOCAL("");
 
         private final String prefix;
 
diff --git a/src/ru/upworld/chat/HideStream.java b/src/ru/upworld/chat/HideStream.java
deleted file mode 100644
index 2e94987..0000000
--- a/src/ru/upworld/chat/HideStream.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package ru.upworld.chat;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-public class HideStream implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void PlayerJoinEvent(PlayerJoinEvent event) {
-        event.setJoinMessage(null);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void PlayerQuitEvent(PlayerQuitEvent event) {
-        event.setQuitMessage(null);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void PlayerDeathEvent(PlayerDeathEvent event) {
-        event.setDeathMessage(null);
-    }
-}
diff --git a/src/ru/upworld/chat/UpWorldChat.java b/src/ru/upworld/chat/UpWorldChat.java
index 036448a..c9cef4d 100644
--- a/src/ru/upworld/chat/UpWorldChat.java
+++ b/src/ru/upworld/chat/UpWorldChat.java
@@ -8,7 +8,6 @@ public class UpWorldChat extends JavaPlugin {
     @Override
     public void onEnable() {
         Bukkit.getPluginManager().registerEvents(new ChatListener(), this);
-        Bukkit.getPluginManager().registerEvents(new HideStream(), this);
         getCommand("msg").setExecutor(new CommandMsg());
         log("Enabled!");
     }