Allow unbanning players who do not have valid userdata

1 files changed, 10 insertions, 2 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java b/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
index dda1475d0..439e715e5 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
@@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
@@ -23,12 +24,19 @@ public class Commandunban extends EssentialsCommand
 
 		try
 		{
-			final User player = getPlayer(server, args, 0, true);
-			player.setBanned(false);
+			final User user = getPlayer(server, args, 0, true);
+			user.setBanned(false);
 			sender.sendMessage(_("unbannedPlayer"));
 		}
 		catch (NoSuchFieldException e)
 		{
+			final OfflinePlayer player = server.getOfflinePlayer(args[0]);
+			if (player.isBanned()) {
+				player.setBanned(false);
+				sender.sendMessage(_("unbannedPlayer"));
+				return;
+			}			
+			
 			throw new Exception(_("playerNotFound"), e);
 		}
 	}