diff options
4 files changed, 21 insertions, 18 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index cbd8d66b2..450a7e2af 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -249,7 +249,7 @@ public class Essentials extends JavaPlugin implements IEssentials } String[] retval = new String[lines.size()]; - if (lines == null || lines.isEmpty() || lines.get(0) == null) + if (lines.isEmpty() || lines.get(0) == null) { try { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java b/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java index a7d778921..b30799adf 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java @@ -23,10 +23,9 @@ public class Commandantioch extends EssentialsCommand ess.broadcastMessage(user.getName(), "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,"); ess.broadcastMessage(user.getName(), "who being naughty in My sight, shall snuff it."); - Location loc = user.getLocation(); - World world = ((CraftWorld)user.getWorld()).getHandle(); - loc = new TargetBlock(user).getTargetBlock().getLocation(); - EntityTNTPrimed tnt = new EntityTNTPrimed(world, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); + final World world = ((CraftWorld)user.getWorld()).getHandle(); + final Location loc = new TargetBlock(user).getTargetBlock().getLocation(); + final EntityTNTPrimed tnt = new EntityTNTPrimed(world, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); world.addEntity(tnt); world.makeSound(tnt, "random.fuse", 1.0F, 1.0F); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index 777fe08e1..40654551f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -22,23 +22,27 @@ public class Commandban extends EssentialsCommand throw new NotEnoughArgumentsException(); } - User p = null; if (server.matchPlayer(args[0]).isEmpty()) { ((CraftServer)server).getHandle().a(args[0]); - sender.sendMessage(Util.format("playerBanned",args[0])); + sender.sendMessage(Util.format("playerBanned", args[0])); } else { - p = ess.getUser(server.matchPlayer(args[0]).get(0)); - String banReason = Util.i18n("defaultBanReason"); - if(args.length > 1) { + final User player = ess.getUser(server.matchPlayer(args[0]).get(0)); + String banReason; + if (args.length > 1) + { banReason = getFinalArg(args, 1); - p.setBanReason(commandLabel); + player.setBanReason(commandLabel); } - p.kickPlayer(banReason); - ((CraftServer)server).getHandle().a(p.getName()); - sender.sendMessage(Util.format("playerBanned", p.getName())); + else + { + banReason = Util.i18n("defaultBanReason"); + } + player.kickPlayer(banReason); + ((CraftServer)server).getHandle().a(player.getName()); + sender.sendMessage(Util.format("playerBanned", player.getName())); } ess.loadBanList(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java index 00686c9b7..f02b99b15 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java @@ -17,7 +17,7 @@ public class Commandbigtree extends EssentialsCommand @Override public void run(Server server, User user, String commandLabel, String[] args) throws Exception { - TreeType tree = TreeType.TREE; + TreeType tree; if (args.length > 0 && args[0].equalsIgnoreCase("redwood")) { tree = TreeType.TALL_REDWOOD; @@ -36,7 +36,7 @@ public class Commandbigtree extends EssentialsCommand double z = user.getLocation().getZ(); // offset tree in direction player is facing - int r = (int)user.getCorrectedYaw(); + final int r = (int)user.getCorrectedYaw(); if (r < 68 || r > 292) // north { x -= 3.0D; @@ -54,8 +54,8 @@ public class Commandbigtree extends EssentialsCommand z += 3.0D; } - Location safeLocation = Util.getSafeDestination(new Location(user.getWorld(), x, y, z)); - boolean success = user.getWorld().generateTree(safeLocation, (TreeType)tree); + final Location safeLocation = Util.getSafeDestination(new Location(user.getWorld(), x, y, z)); + final boolean success = user.getWorld().generateTree(safeLocation, (TreeType)tree); if (success) { charge(user); |