From 198d8529953bcbce6a62f4d833d44cacb9108f2d Mon Sep 17 00:00:00 2001
From: Maxetto <max-8000@hotmail.it>
Date: Wed, 4 Jan 2017 11:47:12 -0500
Subject: [PATCH] Fix broken add-prefix-in-playerlist behavior

---
 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 85fd77d1d..0dab15771 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<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");