From e28f1b1be3bf9a44a0eb4c4116a9a166cec7be20 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Sun, 4 Mar 2012 08:18:25 +0000
Subject: [PATCH] Half-revert double backflip. 10 points. (op prefix changes
 that md-5 broke, thinking I broke op prefixes)

---
 Essentials/src/com/earth2me/essentials/User.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index f89f1a5ad..092b61880 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -262,12 +262,15 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			nickname.append(ess.getSettings().getNicknamePrefix()).append(nick);
 		}
 
-		if (isOp())
+		if (addprefixsuffix && isOp())
 		{
 			try
 			{
-				nickname.insert(0, ess.getSettings().getOperatorColor().toString());
-				nickname.append("§f");
+				final String opPrefix = ess.getSettings().getOperatorColor().toString();
+				if (opPrefix.length() > 0) {
+					nickname.insert(0, opPrefix);
+					nickname.append("§f");
+				}
 			}
 			catch (Exception e)
 			{