From 64e089e15bb764d4d2a56c6979a398a26b99fc69 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Fri, 18 Oct 2013 00:04:17 +0100 Subject: Cleanup --- Essentials/src/com/earth2me/essentials/commands/Commandban.java | 2 +- .../src/com/earth2me/essentials/commands/Commandessentials.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandkickall.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandkill.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandkillall.java | 4 ++-- Essentials/src/com/earth2me/essentials/commands/Commandlightning.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandmute.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandr.java | 4 ++-- Essentials/src/com/earth2me/essentials/commands/Commandremove.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandsudo.java | 4 ++-- Essentials/src/com/earth2me/essentials/commands/Commandtempban.java | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index 6d0efced5..d839cf445 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -45,7 +45,7 @@ public class Commandban extends EssentialsCommand } else { - if (user.isAuthorized("essentials.ban.exempt") && sender instanceof Player) + if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer()) { throw new Exception(_("banExempt")); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java index 50dc8ad1e..8f5a3766d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java @@ -213,7 +213,7 @@ public class Commandessentials extends EssentialsCommand if (sender.isPlayer()) { sender.getSender().sendMessage(playerMoo); - final Player player = (Player)sender; + final Player player = sender.getPlayer(); player.playSound(player.getLocation(), Sound.COW_IDLE, 1, 1.0f); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java b/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java index e0b87dca5..0d3d705b5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java @@ -25,7 +25,7 @@ public class Commanditemdb extends EssentialsCommand if (sender.isPlayer()) { itemHeld = true; - itemStack = ((Player)sender).getItemInHand(); + itemStack = sender.getPlayer().getItemInHand(); } if (itemStack == null) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java index f789cfe32..cc7cd6fac 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java @@ -22,7 +22,7 @@ public class Commandkickall extends EssentialsCommand for (Player onlinePlayer : server.getOnlinePlayers()) { - if (sender.isPlayer() && onlinePlayer.getName().equalsIgnoreCase(((Player)sender).getName())) + if (sender.isPlayer() && onlinePlayer.getName().equalsIgnoreCase(sender.getPlayer().getName())) { continue; } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java index 36698f0b2..3957e1e2c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java @@ -34,7 +34,7 @@ public class Commandkill extends EssentialsLoopCommand { throw new PlayerExemptException(_("killExempt", matchPlayer.getDisplayName())); } - final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE); + final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender.isPlayer() && sender.getPlayer().getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE); server.getPluginManager().callEvent(ede); if (ede.isCancelled() && sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.kill.force")) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java index 1ce8aecc0..b61cbd4db 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java @@ -29,7 +29,7 @@ public class Commandkillall extends EssentialsCommand World world; if (sender.isPlayer()) { - world = ((Player)sender).getWorld(); + world = sender.getPlayer().getWorld(); if (args.length == 1) { try @@ -98,7 +98,7 @@ public class Commandkillall extends EssentialsCommand { if (sender.isPlayer()) { - if (radius >= 0 && ((Player)sender).getLocation().distanceSquared(entity.getLocation()) > radius) + if (radius >= 0 && sender.getPlayer().getLocation().distanceSquared(entity.getLocation()) > radius) { continue; } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java index 254058eb2..80986425e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java @@ -23,7 +23,7 @@ public class Commandlightning extends EssentialsLoopCommand User user = null; if (sender.isPlayer()) { - user = ess.getUser(((Player)sender)); + user = ess.getUser(sender.getPlayer()); if ((args.length < 1 || user != null && !user.isAuthorized("essentials.lightning.others"))) { user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation()); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java index 201768e8c..5d7895d55 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java @@ -43,7 +43,7 @@ public class Commandmute extends EssentialsCommand } else { - if (user.isAuthorized("essentials.mute.exempt") && sender instanceof Player) + if (user.isAuthorized("essentials.mute.exempt") && sender.isPlayer()) { throw new Exception(_("muteExempt")); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java index 825c37c70..12ff95202 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java @@ -64,9 +64,9 @@ public class Commandr extends EssentialsCommand replyTo.setReplyTo(target); if (target != sender) { - if (target instanceof Player) + if (target.isPlayer()) { - ess.getUser((Player)target).setReplyTo(sender); + ess.getUser(target.isPlayer()).setReplyTo(sender); } else { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java index f466f2b66..1d7cc333c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java @@ -118,7 +118,7 @@ public class Commandremove extends EssentialsCommand { if (radius > 0) { - if (((Player)sender).getLocation().distanceSquared(e.getLocation()) > radius) + if (sender.getPlayer().getLocation().distanceSquared(e.getLocation()) > radius) { continue; } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java index 61e31c1a3..54e18b159 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java @@ -30,7 +30,7 @@ public class Commandsudo extends EssentialsCommand final User user = getPlayer(server, sender, args, 0); if(args[1].toLowerCase(Locale.ENGLISH).startsWith("c:")) { - if (user.isAuthorized("essentials.sudo.exempt") && sender instanceof Player) + if (user.isAuthorized("essentials.sudo.exempt") && sender.isPlayer()) { throw new Exception(_("sudoExempt")); } @@ -44,7 +44,7 @@ public class Commandsudo extends EssentialsCommand System.arraycopy(args, 2, arguments, 0, args.length - 2); } - if (user.isAuthorized("essentials.sudo.exempt") && sender instanceof Player) + if (user.isAuthorized("essentials.sudo.exempt") && sender.isPlayer()) { throw new Exception(_("sudoExempt")); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java index f2d39929a..f32967757 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java @@ -36,7 +36,7 @@ public class Commandtempban extends EssentialsCommand } else { - if (user.isAuthorized("essentials.tempban.exempt") && sender instanceof Player) + if (user.isAuthorized("essentials.tempban.exempt") && sender.isPlayer()) { sender.sendMessage(_("tempbanExempt")); return; -- cgit v1.2.3