Revert "Fix broken add-prefix-in-playerlist behavior", as it seems to break more things for other users

This commit is contained in:
vemacs 2017-01-20 09:08:13 -06:00
parent 0b1e1676d0
commit 7973f544ff
1 changed files with 2 additions and 2 deletions

View File

@ -306,12 +306,12 @@ public class User extends UserData implements Comparable<User>, 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");