Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change Nicknames.getNick to use UUID

Browse Source
This commit is contained in:
Len
2022-10-01 19:39:20 +02:00
parent ac994d35a1
commit 3d432a5af6
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
+4 -3
View File
@@ -277,7 +277,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
} else if (NickUtilities.validNick(sender, target, nickName)) { } else if (NickUtilities.validNick(sender, target, nickName)) {
if (target.isOnline()) { if (target.isOnline()) {
setNick(target.getPlayer(), nickName); setNick(target.getUniqueId(), nickName);
} else { } else {
NickUtilities.bungeeMessageHandled(target.getUniqueId(), sender, "Set"); NickUtilities.bungeeMessageHandled(target.getUniqueId(), sender, "Set");
} }
@@ -290,6 +290,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
Nick nick = NickCache.get(target.getUniqueId()); Nick nick = NickCache.get(target.getUniqueId());
nick.setCurrentNick(nickName); nick.setCurrentNick(nickName);
nick.setLastChangedDate(new Date().getTime()); nick.setLastChangedDate(new Date().getTime());
} else { } else {
NickCache.put(target.getUniqueId(), new Nick(target.getUniqueId(), nickName, new Date().getTime())); NickCache.put(target.getUniqueId(), new Nick(target.getUniqueId(), nickName, new Date().getTime()));
} }
@@ -379,8 +380,8 @@ public class Nicknames implements CommandExecutor, TabCompleter {
return user.getNickNameString(); return user.getNickNameString();
} }
public void setNick(final Player player, final String nickName) { public void setNick(final UUID uuid, final String nickName) {
ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); ChatUser user = ChatUserManager.getChatUser(uuid);
user.setDisplayName(nickName); user.setDisplayName(nickName);
} }
galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
+3 -3
View File
@@ -60,7 +60,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
if (nickName == null) { if (nickName == null) {
Nicknames.getInstance().resetNick(player); Nicknames.getInstance().resetNick(player);
} else if (!nickName.equals(strippedNick)) { } else if (!nickName.equals(strippedNick)) {
Nicknames.getInstance().setNick(player, nickName); Nicknames.getInstance().setNick(player.getUniqueId(), nickName);
} }
Nicknames.getInstance().NickCache.put(e.getPlayer().getUniqueId(), nick); Nicknames.getInstance().NickCache.put(e.getPlayer().getUniqueId(), nick);
@@ -130,7 +130,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
if (offlinePlayer.isOnline()) { if (offlinePlayer.isOnline()) {
Nick nick = Queries.getNick(playerUUID); Nick nick = Queries.getNick(playerUUID);
if (nick != null && nick.getCurrentNick() != null) { if (nick != null && nick.getCurrentNick() != null) {
Nicknames.getInstance().setNick(offlinePlayer.getPlayer(), nick.getCurrentNick()); Nicknames.getInstance().setNick(offlinePlayer.getUniqueId(), nick.getCurrentNick());
} }
} }
break; break;
@@ -148,7 +148,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
Nick nick = Queries.getNick(playerUUID); Nick nick = Queries.getNick(playerUUID);
Player target = Bukkit.getPlayer(playerUUID); Player target = Bukkit.getPlayer(playerUUID);
if (target != null && nick != null && nick.getCurrentNick() != null) { if (target != null && nick != null && nick.getCurrentNick() != null) {
Nicknames.getInstance().setNick(target, nick.getCurrentNick()); Nicknames.getInstance().setNick(target.getUniqueId(), nick.getCurrentNick());
target.sendMessage(format(Config.NICK_CHANGED target.sendMessage(format(Config.NICK_CHANGED
.replace("%nickname%", nick.getCurrentNick()))); .replace("%nickname%", nick.getCurrentNick())));
} }
galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
+2 -2
View File
@@ -190,7 +190,7 @@ public class NicknamesGui implements Listener {
.replace("%oldNick%", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick()))); .replace("%oldNick%", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick())));
if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) { if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getNewNick()); Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getNewNick());
owningPlayer.getPlayer().sendMessage(format(Config.NICK_CHANGED owningPlayer.getPlayer().sendMessage(format(Config.NICK_CHANGED
.replace("%nickname%", nick.getNewNick()))); .replace("%nickname%", nick.getNewNick())));
} }
@@ -245,7 +245,7 @@ public class NicknamesGui implements Listener {
} }
if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) { if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick()); Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick());
owningPlayer.getPlayer().sendMessage(format(Config.NICK_NOT_CHANGED)); owningPlayer.getPlayer().sendMessage(format(Config.NICK_NOT_CHANGED));
} }