Fix instanceof Player

Essentials/src/net/ess3/commands/Commandban.java

@@ -21,7 +21,7 @@ public class Commandban extends EssentialsCommand
 		final IUser user = ess.getUserMap().matchUser(args[0], true);
 		if (!user.isOnline())
 		{
-			if (sender instanceof Player && Permissions.BAN_OFFLINE.isAuthorized(user))
+			if (isUser(sender) && Permissions.BAN_OFFLINE.isAuthorized(user))
 			{
 				sender.sendMessage(_("banExempt"));
 				return;
@@ -36,7 +36,7 @@ public class Commandban extends EssentialsCommand
 			}
 		}
 
-		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
+		final String senderName = isUser(sender) ? getPlayer(sender).getDisplayName() : Console.NAME;
 		String banReason;
 		user.getData().setBan(new Ban());
 		if (args.length > 1)

Essentials/src/net/ess3/commands/Commandkillall.java

@@ -5,6 +5,7 @@ import java.util.Locale;
 import static net.ess3.I18n._;
 import net.ess3.bukkit.LivingEntities;
 import org.bukkit.Chunk;
+import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
@@ -20,9 +21,9 @@ public class Commandkillall extends EssentialsCommand
 		String type = "all";
 		int radius = -1;
 		World world;
-		if (sender instanceof Player)
+		if (isUser(sender))
 		{
-			world = ((Player)sender).getWorld();
+			world = getPlayer(sender).getWorld();
 			if (args.length == 1)
 			{
 				try
@@ -81,13 +82,14 @@ public class Commandkillall extends EssentialsCommand
 			entityClass = LivingEntities.fromName(killType).getEntityClass();
 		}
 		int numKills = 0;
+		Location loc = isUser(sender) ? getPlayer(sender).getLocation() : null;
 		for (Chunk chunk : world.getLoadedChunks())
 		{
 			for (Entity entity : chunk.getEntities())
 			{
-				if (sender instanceof Player)
+				if (loc != null)
 				{
-					if (radius >= 0 && ((Player)sender).getLocation().distanceSquared(entity.getLocation()) > radius)
+					if (radius >= 0 && loc.distanceSquared(entity.getLocation()) > radius)
 					{
 						continue;
 					}

Essentials/src/net/ess3/commands/Commandptime.java

@@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
-
 public class Commandptime extends EssentialsCommand
 {
 	public static final Set<String> getAliases = new HashSet<String>();
@@ -41,7 +40,7 @@ public class Commandptime extends EssentialsCommand
 			return;
 		}
 		
-		IUser user = sender instanceof Player ? ess.getUserMap().getUser((Player)sender) : null;
+		IUser user = isUser(sender) ? getUser(sender) : null;
 		if ((!users.contains(user) || users.size() > 1) && user != null && !Permissions.PTIME_OTHERS.isAuthorized(user))
 		{
 			user.sendMessage(_("pTimeOthersPermission"));
@@ -183,7 +182,7 @@ public class Commandptime extends EssentialsCommand
 		// If there is no selector we want the sender itself. Or all users if sender isn't a user.
 		if (selector == null)
 		{
-			final IUser user = sender instanceof Player ? ess.getUserMap().getUser((Player)sender) : null;
+			final IUser user = isUser(sender) ? getUser(sender) : null;
 			if (user == null)
 			{
 				for (Player player : server.getOnlinePlayers())

Essentials/src/net/ess3/commands/Commandr.java

@@ -7,7 +7,6 @@ import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandr extends EssentialsCommand
@@ -24,9 +23,9 @@ public class Commandr extends EssentialsCommand
 		IReplyTo replyTo;
 		String senderName;
 
-		if (sender instanceof Player)
+		if (sender instanceof IUser)
 		{
-			IUser user = ess.getUserMap().getUser((Player)sender);
+			IUser user = getUser(sender);
 			if (Permissions.MSG_COLOR.isAuthorized(user))
 			{
 				message = FormatUtil.replaceFormat(message);
@@ -46,18 +45,16 @@ public class Commandr extends EssentialsCommand
 		}
 
 		final CommandSender target = replyTo.getReplyTo();
-		final String targetName = target instanceof Player ? ((Player)target).getDisplayName() : Console.NAME;
+		if (target == null || (isUser(target) && !getUser(target).isOnline()))
-
-		if (target == null || ((target instanceof Player) && !((Player)target).isOnline()))
 		{
 			throw new Exception(_("foreverAlone"));
 		}
+		final String targetName = isUser(target) ? getPlayer(target).getDisplayName() : Console.NAME;
 
 		sender.sendMessage(_("msgFormat", _("me"), targetName, message));
-		if (target instanceof Player)
+		if (isUser(target))
 		{
-			IUser player = ess.getUserMap().getUser((Player)target);
+			if (isUser(sender) && getUser(target).isIgnoringPlayer(getUser(sender)))
-			if (sender instanceof Player && player.isIgnoringPlayer(ess.getUserMap().getUser((Player)sender)))
 			{
 				return;
 			}
@@ -66,9 +63,9 @@ public class Commandr extends EssentialsCommand
 		replyTo.setReplyTo(target);
 		if (target != sender)
 		{
-			if (target instanceof Player)
+			if (isUser(target))
 			{
-				ess.getUserMap().getUser((Player)target).setReplyTo(sender);
+				getUser(target).setReplyTo(sender);
 			}
 			else
 			{

Essentials/src/net/ess3/commands/Commandtempban.java

@@ -46,7 +46,7 @@ public class Commandtempban extends EssentialsCommand
 		user.setBanned(true);
 		user.queueSave();
 		user.getPlayer().kickPlayer(banReason);
-		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
+		final String senderName = isUser(sender) ? getPlayer(sender).getDisplayName() : Console.NAME;
 
 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{

Essentials/src/net/ess3/commands/Commandtime.java

@@ -122,14 +122,14 @@ public class Commandtime extends EssentialsCommand
 		// If there is no selector we want the world the user is currently in. Or all worlds if it isn't a user.
 		if (selector == null)
 		{
-			final IUser user = sender instanceof Player ? ess.getUserMap().getUser((Player)sender) : null;
+			final Player user = getPlayerOrNull(sender);
 			if (user == null)
 			{
 				worlds.addAll(server.getWorlds());
 			}
 			else
 			{
-				worlds.add(user.getPlayer().getWorld());
+				worlds.add(user.getWorld());
 			}
 			return worlds;
 		}

Essentials/src/net/ess3/commands/Commandtpaall.java

@@ -15,7 +15,7 @@ public class Commandtpaall extends EssentialsCommand
 	{
 		if (args.length < 1)
 		{
-			if (sender instanceof Player)
+			if (isUser(sender))
 			{
 				teleportAAllPlayers(sender, ess.getUserMap().getUser((Player)sender));
 				return;

Essentials/src/net/ess3/commands/Commandtpall.java

@@ -16,7 +16,7 @@ public class Commandtpall extends EssentialsCommand
 	{
 		if (args.length < 1)
 		{
-			if (sender instanceof Player)
+			if (isUser(sender))
 			{
 				teleportAllPlayers(sender, ess.getUserMap().getUser((Player)sender));
 				return;

Essentials/src/net/ess3/listener/EssentialsPlayerListener.java

@@ -120,7 +120,7 @@ public class EssentialsPlayerListener implements Listener
 		final String quitMessage = ess.getSettings().getData().getGeneral().getLeaveMessage();
 		if (quitMessage != null)
 		{
-			final IText itOutput = new KeywordReplacer(new SimpleTextInput(quitMessage), event.getPlayer(), ess);
+			final IText itOutput = new KeywordReplacer(new SimpleTextInput(quitMessage), ess.getUserMap().getUser(event.getPlayer()), ess);
 			final SimpleTextPager stPager = new SimpleTextPager(itOutput);
 			event.setQuitMessage(FormatUtil.replaceFormat(stPager.getString(0)));
 		}
@@ -163,7 +163,7 @@ public class EssentialsPlayerListener implements Listener
 		final String joinMessage = ess.getSettings().getData().getGeneral().getJoinMessage();
 		if (joinMessage != null)
 		{
-			final IText itOutput = new KeywordReplacer(new SimpleTextInput(joinMessage), event.getPlayer(), ess);
+			final IText itOutput = new KeywordReplacer(new SimpleTextInput(joinMessage), ess.getUserMap().getUser(event.getPlayer()), ess);
 			final SimpleTextPager stPager = new SimpleTextPager(itOutput);
 			event.setJoinMessage(FormatUtil.replaceFormat(stPager.getString(0)));
 		}

Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java

@@ -34,9 +34,9 @@ public class KeywordReplacer implements IText
 		String worlds, online, unique, playerlist, date, time;
 		String worldTime12, worldTime24, worldDate, plugins;
 		String userName, address, version;
-		if (sender instanceof Player)
+		if (sender instanceof IUser)
 		{
-			final IUser user = ess.getUserMap().getUser((Player)sender);
+			final IUser user = (IUser)sender;
 			user.setDisplayNick();
 			displayName = user.getPlayer().getDisplayName();
 			userName = user.getPlayer().getName();
@@ -55,11 +55,12 @@ public class KeywordReplacer implements IText
 		}
 
 		int playerHidden = 0;
-		if (sender instanceof Player)
+		if (sender instanceof IUser)
 		{
+			final Player playerUser = ((IUser)sender).getPlayer();
 			for (Player p : ess.getServer().getOnlinePlayers())
 			{
-				if (!p.canSee((Player)sender))
+				if (!p.canSee(playerUser))
 				{
 					playerHidden++;
 				}
@@ -80,11 +81,12 @@ public class KeywordReplacer implements IText
 		worlds = worldsBuilder.toString();
 
 		final StringBuilder playerlistBuilder = new StringBuilder();
-		if (sender instanceof Player)
+		if (sender instanceof IUser)
 		{
+			final Player playerUser = ((IUser)sender).getPlayer();
 			for (Player p : ess.getServer().getOnlinePlayers())
 			{
-				if (!p.canSee((Player)sender))
+				if (!p.canSee(playerUser))
 				{
 					continue;
 				}

Essentials/src/net/ess3/utils/textreader/TextInput.java

@@ -24,11 +24,11 @@ public class TextInput implements IText
 	{
 
 		File file = null;
-		if (sender instanceof Player)
+		if (sender instanceof IUser)
 		{
 			try
 			{
-				final IUser user = ess.getUserMap().getUser((Player)sender);
+				final IUser user = (IUser)sender;
 				file = new File(ess.getPlugin().getDataFolder(), filename + "_" + Util.sanitizeFileName(user.getName()) + ".txt");
 				if (!file.exists())
 				{

EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java

@@ -69,9 +69,9 @@ public abstract class EssentialsChatPlayer implements Listener
 
 	protected void charge(final CommandSender sender, final Trade charge) throws ChargeException
 	{
-		if (sender instanceof Player)
+		if (sender instanceof IUser)
 		{
-			charge.charge(ess.getUserMap().getUser((Player)sender));
+			charge.charge((IUser)sender);
 		}
 	}