From 8aa764f69f6d6a6c6dbe1856fbeb544898d31c94 Mon Sep 17 00:00:00 2001
From: md678685 <md678685@users.noreply.github.com>
Date: Fri, 15 Jun 2018 19:41:56 +0100
Subject: [PATCH] Check whether nick equals "off" before formatting

Fixes #1910.
---
 .../src/com/earth2me/essentials/commands/Commandnick.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
index c5ba7386e..40c901163 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
@@ -55,16 +55,16 @@ public class Commandnick extends EssentialsLoopCommand {
     @Override
     protected void updatePlayer(final Server server, final CommandSource sender, final User target, final String[] args) throws NotEnoughArgumentsException {
         final String nick = args[0];
-        if (target.getName().equalsIgnoreCase(nick)) {
+        if ("off".equalsIgnoreCase(nick)) {
+            setNickname(server, sender, target, null);
+            target.sendMessage(tl("nickNoMore"));
+        } else if (target.getName().equalsIgnoreCase(nick)) {
             String oldName = target.getDisplayName();
             setNickname(server, sender, target, nick);
             if (!target.getDisplayName().equalsIgnoreCase(oldName)) {
                 target.sendMessage(tl("nickNoMore"));
             }
             target.sendMessage(tl("nickSet", target.getDisplayName()));
-        } else if ("off".equalsIgnoreCase(nick)) {
-            setNickname(server, sender, target, null);
-            target.sendMessage(tl("nickNoMore"));
         } else if (nickInUse(server, target, nick)) {
             throw new NotEnoughArgumentsException(tl("nickInUse"));
         } else {