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

Show correct nickname in previews

Browse Source
This commit is contained in:
Len 2022-10-03 17:42:28 +02:00
parent 76f713409b
commit 7de83f536b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
View File

@ -191,8 +191,8 @@ public class Nicknames implements CommandExecutor, TabCompleter {
if (timeSinceLastChange > waitTime || player.hasPermission("utility.nick.admin")) { if (timeSinceLastChange > waitTime || player.hasPermission("utility.nick.admin")) {
if (nick.hasRequest()) { if (nick.hasRequest()) {
player.sendMessage(Utility.parseMiniMessage(Config.NICK_REQUEST_PLACED, player.sendMessage(Utility.parseMiniMessage(Config.NICK_REQUEST_PLACED,
Placeholder.unparsed("oldrequestednick", nick.getNewNick()), Placeholder.component("oldrequestednick", Utility.applyColor(nick.getNewNick())),
Placeholder.unparsed("newrequestednick", nickName))); Placeholder.component("newrequestednick", Utility.applyColor(nickName))));
} }
nick.setNewNick(nickName); nick.setNewNick(nickName);
nick.setRequestedDate(new Date().getTime()); nick.setRequestedDate(new Date().getTime());
@ -207,7 +207,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
Queries.newNicknameRequest(uniqueId, nickName); Queries.newNicknameRequest(uniqueId, nickName);
bungeeMessageRequest(player); bungeeMessageRequest(player);
player.sendMessage(Utility.parseMiniMessage(Config.NICK_REQUESTED, player.sendMessage(Utility.parseMiniMessage(Config.NICK_REQUESTED,
Placeholder.unparsed("nick", nickName))); Placeholder.component("nick", Utility.applyColor(nickName))));
} }
private void bungeeMessageRequest(Player player) { private void bungeeMessageRequest(Player player) {

12
galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
View File

@ -98,8 +98,8 @@ public class NicknamesGui implements Listener {
meta.displayName(miniMessage.deserialize(offlinePlayer.getName())); meta.displayName(miniMessage.deserialize(offlinePlayer.getName()));
TagResolver resolver = TagResolver.resolver( TagResolver resolver = TagResolver.resolver(
Placeholder.unparsed("newnick", nick.getNewNick()), Placeholder.component("newnick", Utility.applyColor(nick.getNewNick())),
Placeholder.unparsed("oldnick", nick.getCurrentNick() == null ? "None" : nick.getCurrentNick()), Placeholder.component("oldnick", Utility.applyColor(nick.getCurrentNick() == null ? "None" : nick.getCurrentNick())),
Placeholder.unparsed("lastchanged", nick.getLastChangedDate() == 0 ? "Not Applicable" : nick.getLastChangedDateFormatted())); Placeholder.unparsed("lastchanged", nick.getLastChangedDate() == 0 ? "Not Applicable" : nick.getLastChangedDateFormatted()));
meta.lore(lore.stream().map(a -> miniMessage.deserialize(a, resolver)).collect(Collectors.toList())); meta.lore(lore.stream().map(a -> miniMessage.deserialize(a, resolver)).collect(Collectors.toList()));
playerHead.setItemMeta(meta); playerHead.setItemMeta(meta);
@ -194,8 +194,8 @@ public class NicknamesGui implements Listener {
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_ACCEPTED, p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_ACCEPTED,
Placeholder.component("targetplayer", clickedItem.getItemMeta().displayName()), Placeholder.component("targetplayer", clickedItem.getItemMeta().displayName()),
Placeholder.unparsed("newnick", nick.getNewNick()), Placeholder.component("newnick", Utility.applyColor(nick.getNewNick())),
Placeholder.unparsed("oldnick", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick()))); Placeholder.component("oldnick", Utility.applyColor(nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick()))));
if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) { if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getNewNick()); Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getNewNick());
@ -241,8 +241,8 @@ public class NicknamesGui implements Listener {
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_DENIED, p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_DENIED,
Placeholder.unparsed("targetplayer", owningPlayer.getName()), Placeholder.unparsed("targetplayer", owningPlayer.getName()),
Placeholder.unparsed("newnick", nick.getNewNick()), Placeholder.component("newnick", Utility.applyColor(nick.getNewNick())),
Placeholder.unparsed("oldnick", nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick()))); Placeholder.component("oldnick", Utility.applyColor(nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick()))));
if (Nicknames.getInstance().NickCache.containsKey(uniqueId) if (Nicknames.getInstance().NickCache.containsKey(uniqueId)
&& Nicknames.getInstance().NickCache.get(uniqueId).getCurrentNick() != null) { && Nicknames.getInstance().NickCache.get(uniqueId).getCurrentNick() != null) {