From 2de3f1f6e7ca7a17039158186957e050a6023a14 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Fri, 20 Apr 2018 23:37:41 +0200
Subject: [PATCH] Changing nicknames instead of display names

Essentials dependency fixed
---
 pom.xml                                       |  2 +-
 .../listener/PlayerJoinLeaveListener.java     | 21 ++++++++++---------
 .../chat/listener/PlayerListener.java         |  5 +++++
 src/main/resources/plugin.yml                 |  2 ++
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 890ef83..3bf9c09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
 		</repository>
 		<repository>
 			<id>Essentials</id>
-			<url>http://repo.ess3.net/</url>
+			<url>http://repo.ess3.net/content/repositories/essrel/</url>
 		</repository>
 		<repository>
 			<id>Votifier</id>
diff --git a/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java b/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java
index 711670d..64e2cc5 100644
--- a/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java
+++ b/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java
@@ -9,6 +9,7 @@ import buttondevteam.lib.player.TBMCPlayerJoinEvent;
 import buttondevteam.lib.player.TBMCPlayerLoadEvent;
 import buttondevteam.lib.player.TBMCPlayerSaveEvent;
 import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.User;
 import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
 import lombok.val;
 import org.bukkit.Bukkit;
@@ -88,9 +89,9 @@ public class PlayerJoinLeaveListener implements Listener {
 			nwithoutformatting = p.getName();
 		PlayerListener.nicknames.put(nwithoutformatting, p.getUniqueId());
 
-        Bukkit.getScheduler().runTask(PluginMain.Instance, () -> {
+        Bukkit.getScheduler().runTaskLater(PluginMain.Instance, () -> {
             updatePlayerColors(p, cp); //TODO: Doesn't have effect
-        });
+        }, 5);
 
 		if (cp.ChatOnly || p.getGameMode().equals(GameMode.SPECTATOR)) {
 			cp.ChatOnly = false;
@@ -108,8 +109,10 @@ public class PlayerJoinLeaveListener implements Listener {
 		UnlolCommand.Lastlol.values().removeIf(lld -> lld.getLolowner().equals(event.getPlayer()));
 	}
 
-    private static String getPlayerDisplayName(Player player) {
-        String nickname = PluginMain.essentials.getUser(player).getNick(true);
+    private static String getPlayerNickname(Player player, User user) {
+        String nickname = user.getNick(true);
+        if (nickname.contains("~")) //StartsWith doesn't work because of color codes
+            nickname = nickname.replace("~", ""); //It gets stacked otherwise
         val res = PluginMain.TU.getResidentMap().get(player.getName().toLowerCase());
         if (res == null || !res.hasTown())
             return nickname;
@@ -129,10 +132,6 @@ public class PlayerJoinLeaveListener implements Listener {
             int[] ncl = nclar == null ? null : nclar.stream().mapToInt(Integer::intValue).toArray();
             if (ncl != null && (Arrays.stream(ncl).sum() != name.length() || ncl.length != clrs.length))
                 ncl = null; // Reset if name length changed
-            if (name.charAt(0) == '~') { // Ignore ~ in nicknames
-                prevlen.incrementAndGet();
-                ret.append("~");
-            }
             for (int i = 0; i < clrs.length; i++)
                 ret.append(coloredNamePart.apply(ncl == null ? len : ncl[i], i));
             return ret.toString();
@@ -145,8 +144,10 @@ public class PlayerJoinLeaveListener implements Listener {
         updatePlayerColors(player, ChatPlayer.getPlayer(player.getUniqueId(), ChatPlayer.class));
     }
 
-    public static void updatePlayerColors(Player player, ChatPlayer cp) { //Probably at join
-        player.setDisplayName(getPlayerDisplayName(player));
+    public static void updatePlayerColors(Player player, ChatPlayer cp) { //Probably at join - nop, nicknames
+        User user = PluginMain.essentials.getUser(player);
+        user.setNickname(getPlayerNickname(player, user));
+        user.setDisplayNick(); //These won't fire the nick change event
         cp.FlairUpdate(); //Update in list
     }
 }
diff --git a/src/main/java/buttondevteam/chat/listener/PlayerListener.java b/src/main/java/buttondevteam/chat/listener/PlayerListener.java
index 3f1b772..923e9e8 100644
--- a/src/main/java/buttondevteam/chat/listener/PlayerListener.java
+++ b/src/main/java/buttondevteam/chat/listener/PlayerListener.java
@@ -292,5 +292,10 @@ public class PlayerListener implements Listener {
 	@EventHandler
 	public void onNickChange(NickChangeEvent e) {
 		nicknames.inverse().put(e.getAffected().getBase().getUniqueId(), e.getValue());
+        //PlayerJoinLeaveListener.updatePlayerColors(e.getAffected().getBase()); //Won't fire this event again
+
+        Bukkit.getScheduler().runTaskLater(PluginMain.Instance, () -> {
+            PlayerJoinLeaveListener.updatePlayerColors(e.getAffected().getBase()); //TODO: Doesn't have effect
+        }, 1);
 	}
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 7f4f733..2635b37 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -28,6 +28,8 @@ commands:
     aliases: ww
   lenny:
     description: Lenny face.
+  ftop:
+    description: Top respect.
 author: NorbiPeti
 depend:
 - Essentials