From 7973f544fff0c01e174f9833df98ae6b90b87d5c Mon Sep 17 00:00:00 2001 From: vemacs Date: Fri, 20 Jan 2017 09:08:13 -0600 Subject: [PATCH] Revert "Fix broken add-prefix-in-playerlist behavior", as it seems to break more things for other users --- Essentials/src/com/earth2me/essentials/User.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 0dab15771..85fd77d1d 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -306,12 +306,12 @@ public class User extends UserData implements Comparable, IMessageRecipien if (ess.getSettings().addPrefixSuffix()) { //These two extra toggles are not documented, because they are mostly redundant #EasterEgg - if (withPrefix && !ess.getSettings().disablePrefix()) { + if (withPrefix || !ess.getSettings().disablePrefix()) { final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', '§'); prefix.insert(0, ptext); suffix = "§r"; } - if (withSuffix && !ess.getSettings().disableSuffix()) { + if (withSuffix || !ess.getSettings().disableSuffix()) { final String stext = ess.getPermissionsHandler().getSuffix(base).replace('&', '§'); suffix = stext + "§r"; suffix = suffix.replace("§f§f", "§f").replace("§f§r", "§r").replace("§r§r", "§r");