From 1d7302d81b42efb251009dfa90612e55eb58cdf2 Mon Sep 17 00:00:00 2001 From: Minenash Date: Fri, 11 Jan 2019 23:43:05 -0500 Subject: HotFix: Fixed crashing while reading mail from offline players. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a temp fix, and the features removed/ignored will be readded again soon™. --- src/main/java/com/redstoner/modules/mail/Msg.java | 51 +++++++++-------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/redstoner/modules/mail/Msg.java b/src/main/java/com/redstoner/modules/mail/Msg.java index 8bb666f..e596914 100644 --- a/src/main/java/com/redstoner/modules/mail/Msg.java +++ b/src/main/java/com/redstoner/modules/mail/Msg.java @@ -3,6 +3,7 @@ package com.redstoner.modules.mail; import java.util.UUID; import org.bukkit.Bukkit; +import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.json.simple.JSONObject; @@ -56,9 +57,9 @@ public class Msg { } public String getChain() { - Player p = Bukkit.getOfflinePlayer(UUID.fromString(sender)).getPlayer(); + OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString(sender)); - String line = getPrefix(p) + p.getName() + "&7:&f " + message; + String line = "&9" + p.getName() + "&7:&f " + message; if (chain == null) return line; @@ -67,17 +68,14 @@ public class Msg { } public void showMinimal(CommandSender viewer, Theme theme, boolean showDisplayName) { - Player p = Bukkit.getOfflinePlayer(UUID.fromString(sender)).getPlayer(); - String name = getPrefix(p) + p.getName(); + OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString(sender)); + String name = "&9" + p.getName(); Message msg = ChatAPI.createMessage(viewer) .appendText(theme.getBracketColor() + "[") .appendTextHover(theme.getInfoColor() + "I", "&9Time Sent:\n&7" + timeSent + "\nID: " + id) .appendText(theme.getBracketColor() + "] "); - if (showDisplayName) - msg.appendTextHover(p.getDisplayName(), name); - else - msg.appendText(name); + msg.appendText(name); msg.appendText(theme.getColonColor() + ": "); if (chain == null) msg.appendText(message).send(); @@ -86,8 +84,8 @@ public class Msg { } public void showSimple(CommandSender viewer, Theme theme, boolean showDisplayName) { - Player p = Bukkit.getOfflinePlayer(UUID.fromString(sender)).getPlayer(); - String name = getPrefix(p) + p.getName(); + OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString(sender)); + String name = "&9" + p.getName(); Message msg = ChatAPI.createMessage(viewer) .appendText(theme.getBracketColor() + "[") @@ -95,10 +93,7 @@ public class Msg { .appendText(theme.getBracketColor() + "][") .appendTextHover(theme.getInfoColor() + "I", "&9Time Sent:\n&7" + timeSent + "\nID: " + id) .appendText(theme.getBracketColor() + "] "); - if (showDisplayName) - msg.appendTextHover(p.getDisplayName(), name); - else - msg.appendText(name); + msg.appendText(name); msg.appendText(theme.getColonColor() + ": "); if (chain == null) msg.appendText(message).send(); @@ -107,8 +102,8 @@ public class Msg { } public void showNormal(CommandSender viewer, Theme theme, boolean showDisplayName) { - Player p = Bukkit.getOfflinePlayer(UUID.fromString(sender)).getPlayer(); - String name = getPrefix(p) + p.getName(); + OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString(sender)); + String name = "&9" + p.getName(); Message msg = ChatAPI.createMessage(viewer) .appendText(theme.getBracketColor() + "[") @@ -118,10 +113,7 @@ public class Msg { .appendText(theme.getBracketColor() + "][") .appendSuggestHover(theme.getReplyColor() + "Reply", "/mail reply " + id + " ", "&7Reply") .appendText(theme.getBracketColor() + "] "); - if (showDisplayName) - msg.appendTextHover(p.getDisplayName(), name); - else - msg.appendText(name); + msg.appendText(name); msg.appendText(theme.getColonColor() + ": "); if (chain == null) msg.appendText(message).send(); @@ -130,8 +122,8 @@ public class Msg { } public void showFull(CommandSender viewer, Theme theme, boolean showDisplayName) { - Player p = Bukkit.getOfflinePlayer(UUID.fromString(sender)).getPlayer(); - String name = getPrefix(p) + p.getName(); + OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString(sender)).getPlayer(); + String name = "&9" + p.getName(); Message msg = ChatAPI.createMessage(viewer) .appendText(theme.getBracketColor() + "[") @@ -143,10 +135,7 @@ public class Msg { .appendText(theme.getBracketColor() + "][") .appendSendChatHover(theme.getArchiveColor() + "Archive", "/mail archive " + id + " ", "&6Archive") .appendText(theme.getBracketColor() + "] "); - if (showDisplayName) - msg.appendTextHover(p.getDisplayName(), name); - else - msg.appendText(name); + msg.appendText(name); msg.appendText(theme.getColonColor() + ": "); if (chain == null) msg.appendText(message).send(); @@ -155,8 +144,8 @@ public class Msg { } public void showArchived(CommandSender viewer, Theme theme, boolean showDisplayName) { - Player p = Bukkit.getOfflinePlayer(UUID.fromString(sender)).getPlayer(); - String name = getPrefix(p) + p.getName(); + OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString(sender)); + String name = "&9" + p.getName(); Message msg = ChatAPI.createMessage(viewer) .appendText(theme.getBracketColor() + "[") @@ -164,16 +153,14 @@ public class Msg { .appendText(theme.getBracketColor() + "][") .appendTextHover(theme.getInfoColor() + "I", "&9Time Sent:\n&7" + timeSent + "\nID: " + id) .appendText(theme.getBracketColor() + "] "); - if (showDisplayName) - msg.appendTextHover(p.getDisplayName(), name); - else - msg.appendText(name); + msg.appendText(name); msg.appendText(theme.getColonColor() + ": "); if (chain == null) msg.appendText(message).send(); else msg.appendTextHover(message, chain).send(); } + private String getPrefix(Player player) { -- cgit v1.2.3