From ec6e8431e3edecadb25197f17f126f2750fec689 Mon Sep 17 00:00:00 2001 From: StevenLawson Date: Wed, 14 Aug 2013 09:28:19 -0400 Subject: [PATCH] Revert "Added /premium" This reverts commit 0964871e8b3ff36caff2acc5d6c58c1a16c962b8. --- appinfo.properties | 6 +- buildnumber.properties | 4 +- .../Commands/Command_adminmode.java | 6 +- .../Commands/Command_blockcmd.java | 20 +-- .../Commands/Command_cage.java | 18 +-- .../Commands/Command_cake.java | 12 +- .../Commands/Command_cartsit.java | 4 +- .../Commands/Command_cmdlist.java | 6 +- .../Commands/Command_creative.java | 16 +-- .../Commands/Command_deafen.java | 4 +- .../Commands/Command_debug.java | 4 +- .../Commands/Command_deop.java | 12 +- .../Commands/Command_deopall.java | 6 +- .../Commands/Command_dispfill.java | 4 +- .../Commands/Command_doom.java | 46 +++---- .../Commands/Command_enchant.java | 4 +- .../Commands/Command_expel.java | 12 +- .../Commands/Command_explosives.java | 4 +- .../Commands/Command_findip.java | 10 +- .../TotalFreedomMod/Commands/Command_fr.java | 18 +-- .../Commands/Command_fuckoff.java | 2 +- .../Commands/Command_gadmin.java | 52 ++++---- .../Commands/Command_gcmd.java | 20 +-- .../Commands/Command_glist.java | 16 +-- .../Commands/Command_gtfo.java | 30 ++--- .../Commands/Command_halt.java | 26 ++-- .../Commands/Command_health.java | 4 +- .../Commands/Command_invis.java | 10 +- .../Commands/Command_jumppads.java | 2 +- .../Commands/Command_kicknoob.java | 6 +- .../Commands/Command_landmine.java | 2 +- .../Commands/Command_lastcmd.java | 12 +- .../Commands/Command_list.java | 18 +-- .../Commands/Command_listsync.java | 8 +- .../Commands/Command_lockup.java | 48 +++---- .../Commands/Command_logs.java | 4 +- .../TotalFreedomMod/Commands/Command_nf.java | 4 +- .../Commands/Command_onlinemode.java | 8 +- .../TotalFreedomMod/Commands/Command_op.java | 12 +- .../Commands/Command_opall.java | 8 +- .../TotalFreedomMod/Commands/Command_ops.java | 12 +- .../Commands/Command_orbit.java | 22 ++-- .../Commands/Command_plugincontrol.java | 18 +-- .../Commands/Command_potion.java | 12 +- .../Commands/Command_premium.java | 72 ---------- .../Commands/Command_purgeall.java | 8 +- .../Commands/Command_qdeop.java | 10 +- .../TotalFreedomMod/Commands/Command_qop.java | 10 +- .../Commands/Command_radar.java | 8 +- .../Commands/Command_rank.java | 14 +- .../TotalFreedomMod/Commands/Command_ro.java | 12 +- .../Commands/Command_rollback.java | 2 +- .../Commands/Command_saconfig.java | 18 +-- .../TotalFreedomMod/Commands/Command_say.java | 4 +- .../Commands/Command_setl.java | 4 +- .../Commands/Command_setlevel.java | 2 +- .../Commands/Command_smite.java | 26 ++-- .../Commands/Command_stfu.java | 32 ++--- .../Commands/Command_stop.java | 4 +- .../Commands/Command_survival.java | 20 +-- .../TotalFreedomMod/Commands/Command_tag.java | 18 +-- .../Commands/Command_tban.java | 14 +- .../Commands/Command_tempban.java | 16 +-- .../Commands/Command_tfbanlist.java | 8 +- .../Commands/Command_tfipbanlist.java | 4 +- .../Commands/Command_tfupdate.java | 4 +- .../Commands/Command_tossmob.java | 2 +- .../Commands/Command_whitelist.java | 36 ++--- .../Commands/Command_whohas.java | 12 +- .../Commands/Command_wildcard.java | 4 +- .../Commands/Command_wipeflatlands.java | 4 +- .../TotalFreedomMod/Commands/TFM_Command.java | 6 +- .../Commands/TFM_CommandLoader.java | 16 +-- .../Listener/TFM_BlockListener.java | 64 ++++----- .../Listener/TFM_PlayerListener.java | 124 +++++++++--------- .../Listener/TFM_ServerListener.java | 8 +- .../TFM_DisguiseCraftBridge.java | 10 +- .../TotalFreedomMod/TFM_Heartbeat.java | 4 +- .../StevenLawson/TotalFreedomMod/TFM_Log.java | 4 +- .../TotalFreedomMod/TFM_PlayerData.java | 12 +- .../TotalFreedomMod/TFM_ProtectedArea.java | 8 +- .../TotalFreedomMod/TFM_ServerInterface.java | 8 +- .../TotalFreedomMod/TFM_ServiceChecker.java | 4 +- .../TotalFreedomMod/TFM_Superadmin.java | 4 +- .../TotalFreedomMod/TFM_SuperadminList.java | 50 +++---- .../TotalFreedomMod/TFM_TwitterHandler.java | 4 +- .../TotalFreedomMod/TFM_UserList.java | 24 ++-- .../TotalFreedomMod/TFM_Util.java | 64 ++++----- .../TotalFreedomMod/TFM_WorldEditBridge.java | 38 +++--- .../TotalFreedomMod/TotalFreedomMod.java | 32 ++--- 90 files changed, 676 insertions(+), 748 deletions(-) delete mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java diff --git a/appinfo.properties b/appinfo.properties index b9147705..966d8a24 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Wed, 14 Aug 2013 15:07:06 +0200 +#Tue, 13 Aug 2013 16:50:36 -0400 program.VERSION=2.22 -program.BUILDNUM=467 -program.BUILDDATE=08/14/2013 03\:07 PM +program.BUILDNUM=458 +program.BUILDDATE=08/13/2013 04\:50 PM diff --git a/buildnumber.properties b/buildnumber.properties index b25e3619..af1637aa 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Aug 14 15:07:06 CEST 2013 -build.number=468 +#Tue Aug 13 16:50:36 EDT 2013 +build.number=459 diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java index c964c018..4e7ca18d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java @@ -29,11 +29,11 @@ public class Command_adminmode extends TFM_Command { TotalFreedomMod.adminOnlyMode = true; TFM_Util.adminAction(sender.getName(), "Closing the server to non-superadmins.", true); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { - player.kickPlayer("Server is now closed to non-superadmins."); + p.kickPlayer("Server is now closed to non-superadmins."); } } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java index 240af356..9444a620 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java @@ -23,9 +23,9 @@ public class Command_blockcmd extends TFM_Command { TFM_Util.adminAction(sender.getName(), "Unblocking commands for all players", true); int counter = 0; - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); if (playerdata.allCommandsBlocked()) { counter += 1; @@ -36,28 +36,28 @@ public class Command_blockcmd extends TFM_Command return true; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage()); + playerMsg(ex.getMessage()); return true; } - if (TFM_SuperadminList.isUserSuperadmin(player)) + if (TFM_SuperadminList.isUserSuperadmin(p)) { - playerMsg(player.getName() + " is a Superadmin, and cannot have their commands blocked."); + playerMsg(p.getName() + " is a Superadmin, and cannot have their commands blocked."); return true; } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.setCommandsBlocked(!playerdata.allCommandsBlocked()); - TFM_Util.adminAction(sender.getName(), (playerdata.allCommandsBlocked() ? "B" : "Unb") + "locking all commands for " + player.getName(), true); + TFM_Util.adminAction(sender.getName(), (playerdata.allCommandsBlocked() ? "B" : "Unb") + "locking all commands for " + p.getName(), true); playerMsg((playerdata.allCommandsBlocked() ? "B" : "Unb") + "locked all commands."); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java index f4046984..3b369441 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java @@ -21,18 +21,18 @@ public class Command_cage extends TFM_Command return false; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); Material cage_material_outer = Material.GLASS; Material cage_material_inner = Material.AIR; @@ -40,7 +40,7 @@ public class Command_cage extends TFM_Command { if (TFM_Util.isStopCommand(args[1])) { - TFM_Util.adminAction(sender.getName(), "Uncaging " + player.getName() + ".", true); + TFM_Util.adminAction(sender.getName(), "Uncaging " + p.getName() + ".", true); playerdata.setCaged(false); playerdata.regenerateHistory(); @@ -70,7 +70,7 @@ public class Command_cage extends TFM_Command } } - Location target_pos = player.getLocation().add(0, 1, 0); + Location target_pos = p.getLocation().add(0, 1, 0); playerdata.setCaged(true, target_pos, cage_material_outer, cage_material_inner); playerdata.regenerateHistory(); playerdata.clearHistory(); @@ -78,9 +78,9 @@ public class Command_cage extends TFM_Command TFM_Util.generateCube(target_pos, 2, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER)); TFM_Util.generateCube(target_pos, 1, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.INNER)); - player.setGameMode(GameMode.SURVIVAL); + p.setGameMode(GameMode.SURVIVAL); - TFM_Util.adminAction(sender.getName(), "Caging " + player.getName() + ".", true); + TFM_Util.adminAction(sender.getName(), "Caging " + p.getName() + ".", true); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java index 18e84ae2..66ff04a0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java @@ -28,14 +28,14 @@ public class Command_cake extends TFM_Command output.append(ChatColor.COLOR_CHAR).append(color_code).append(word).append(" "); } - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { ItemStack heldItem = new ItemStack(Material.CAKE, 1); - player.getInventory().setItem(player.getInventory().firstEmpty(), heldItem); - player.awardAchievement(Achievement.MINE_WOOD); - player.awardAchievement(Achievement.BUILD_WORKBENCH); - player.awardAchievement(Achievement.BUILD_HOE); - player.awardAchievement(Achievement.BAKE_CAKE); + p.getInventory().setItem(p.getInventory().firstEmpty(), heldItem); + p.awardAchievement(Achievement.MINE_WOOD); + p.awardAchievement(Achievement.BUILD_WORKBENCH); + p.awardAchievement(Achievement.BUILD_HOE); + p.awardAchievement(Achievement.BAKE_CAKE); } TFM_Util.bcastMsg(output.toString()); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java index ac4125b4..8e5c3a09 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java @@ -21,9 +21,9 @@ public class Command_cartsit extends TFM_Command { target_player = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java index a7a5aff8..66de9a62 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java @@ -21,11 +21,11 @@ public class Command_cmdlist extends TFM_Command { List commands = new ArrayList(); - for (Plugin target_plugin : server.getPluginManager().getPlugins()) + for (Plugin p : server.getPluginManager().getPlugins()) { try { - PluginDescriptionFile desc = target_plugin.getDescription(); + PluginDescriptionFile desc = p.getDescription(); Map> map = (Map>) desc.getCommands(); if (map != null) @@ -37,7 +37,7 @@ public class Command_cmdlist extends TFM_Command } } } - catch (Throwable e) + catch (Throwable ex) { } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java index 561c2fed..bddc03d6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java @@ -24,10 +24,10 @@ public class Command_creative extends TFM_Command } } - Player target; + Player p; if (args.length == 0) { - target = sender_p; + p = sender_p; } else { @@ -56,19 +56,19 @@ public class Command_creative extends TFM_Command try { - target = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } } - playerMsg("Setting " + target.getName() + " to game mode 'Creative'."); - playerMsg(target, sender.getName() + " set your game mode to 'Creative'."); - target.setGameMode(GameMode.CREATIVE); + playerMsg("Setting " + p.getName() + " to game mode 'Creative'."); + playerMsg(p, sender.getName() + " set your game mode to 'Creative'."); + p.setGameMode(GameMode.CREATIVE); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java index 982c4f1a..05e8290f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java @@ -18,7 +18,7 @@ public class Command_deafen extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - for (final Player player: server.getOnlinePlayers()) + for (final Player p : server.getOnlinePlayers()) { for (double percent = 0.0; percent <= 1.0; percent += (1.0 / STEPS)) { @@ -29,7 +29,7 @@ public class Command_deafen extends TFM_Command @Override public void run() { - player.playSound(randomOffset(player.getLocation(), 5.0), Sound.values()[random.nextInt(Sound.values().length)], 100.0f, pitch); + p.playSound(randomOffset(p.getLocation(), 5.0), Sound.values()[random.nextInt(Sound.values().length)], 100.0f, pitch); } }.runTaskLater(plugin, Math.round(20.0 * percent * 2.0)); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_debug.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_debug.java index 5870fe9b..ac19f281 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_debug.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_debug.java @@ -34,9 +34,9 @@ public class Command_debug extends TFM_Command sender.sendMessage("Debug: OK"); } - catch (Exception e) + catch (Exception ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java index c3403e7e..dcda66b7 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java @@ -18,25 +18,25 @@ public class Command_deop extends TFM_Command return false; } - OfflinePlayer player = null; + OfflinePlayer p = null; for (Player onlinePlayer : server.getOnlinePlayers()) { if (args[0].equalsIgnoreCase(onlinePlayer.getName())) { - player = onlinePlayer; + p = onlinePlayer; } } // if the player is not online - if (player == null) + if (p == null) { - player = server.getOfflinePlayer(args[0]); + p = server.getOfflinePlayer(args[0]); } - TFM_Util.adminAction(sender.getName(), "De-opping " + player.getName(), false); + TFM_Util.adminAction(sender.getName(), "De-opping " + p.getName(), false); - player.setOp(false); + p.setOp(false); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java index fbb66be1..59ce6cf6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java @@ -15,10 +15,10 @@ public class Command_deopall extends TFM_Command { TFM_Util.adminAction(sender.getName(), "De-opping all players on the server", true); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - player.setOp(false); - player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); + p.setOp(false); + p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java index 5a4ba1cc..894bc722 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java @@ -29,7 +29,7 @@ public class Command_dispfill extends TFM_Command { radius = Math.max(5, Math.min(25, Integer.parseInt(args[0]))); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { sender.sendMessage("Invalid radius."); return true; @@ -49,7 +49,7 @@ public class Command_dispfill extends TFM_Command { is = new ItemStack(Integer.parseInt(search_item), 64); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java index ee4d61be..dc4f05b9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java @@ -22,53 +22,53 @@ public class Command_doom extends TFM_Command return false; } - final Player player; + final Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } - TFM_Util.adminAction(sender.getName(), "Casting oblivion over " + player.getName(), true); - TFM_Util.bcastMsg(player.getName() + " will be completely obliviated!", ChatColor.RED); + TFM_Util.adminAction(sender.getName(), "Casting oblivion over " + p.getName(), true); + TFM_Util.bcastMsg(p.getName() + " will be completely obliviated!", ChatColor.RED); - final String IP = player.getAddress().getAddress().getHostAddress().trim(); + final String IP = p.getAddress().getAddress().getHostAddress().trim(); // remove from superadmin - if (TFM_SuperadminList.isUserSuperadmin(player)) + if (TFM_SuperadminList.isUserSuperadmin(p)) { - TFM_Util.adminAction(sender.getName(), "Removing " + player.getName() + " from the superadmin list.", true); - TFM_SuperadminList.removeSuperadmin(player); + TFM_Util.adminAction(sender.getName(), "Removing " + p.getName() + " from the superadmin list.", true); + TFM_SuperadminList.removeSuperadmin(p); } // remove from whitelist - player.setWhitelisted(false); + p.setWhitelisted(false); // deop - player.setOp(false); + p.setOp(false); // ban IP TFM_ServerInterface.banIP(IP, null, null, null); // ban name - TFM_ServerInterface.banUsername(player.getName(), null, null, null); + TFM_ServerInterface.banUsername(p.getName(), null, null, null); // set gamemode to survival - player.setGameMode(GameMode.SURVIVAL); + p.setGameMode(GameMode.SURVIVAL); // clear inventory - player.closeInventory(); - player.getInventory().clear(); + p.closeInventory(); + p.getInventory().clear(); // ignite player - player.setFireTicks(10000); + p.setFireTicks(10000); // generate explosion - player.getWorld().createExplosion(player.getLocation(), 4F); + p.getWorld().createExplosion(p.getLocation(), 4F); new BukkitRunnable() { @@ -76,10 +76,10 @@ public class Command_doom extends TFM_Command public void run() { // strike lightning - player.getWorld().strikeLightning(player.getLocation()); + p.getWorld().strikeLightning(p.getLocation()); // kill (if not done already) - player.setHealth(0.0); + p.setHealth(0.0); } }.runTaskLater(plugin, 20L * 2L); @@ -89,13 +89,13 @@ public class Command_doom extends TFM_Command public void run() { // message - TFM_Util.adminAction(sender.getName(), "Banning " + player.getName() + ", IP: " + IP, true); + TFM_Util.adminAction(sender.getName(), "Banning " + p.getName() + ", IP: " + IP, true); // generate explosion - player.getWorld().createExplosion(player.getLocation(), 4F); + p.getWorld().createExplosion(p.getLocation(), 4F); // kick player - player.kickPlayer(ChatColor.RED + "FUCKOFF, and get your shit together!"); + p.kickPlayer(ChatColor.RED + "FUCKOFF, and get your shit together!"); } }.runTaskLater(plugin, 20L * 3L); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java index 8c0a7cba..29dacb8b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java @@ -68,7 +68,7 @@ public class Command_enchant extends TFM_Command itemInHand.addEnchantment(ench, ench.getMaxLevel()); } } - catch (Exception e) + catch (Exception ex) { TFM_Log.info("Error using " + ench.getName() + " on " + itemInHand.getType().name() + " held by " + sender_p.getName() + "."); } @@ -98,7 +98,7 @@ public class Command_enchant extends TFM_Command { ench = Enchantment.getByName(args[1]); } - catch (Exception e) + catch (Exception ex) { } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java index dddc74b2..c409ea44 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java @@ -38,25 +38,25 @@ public class Command_expel extends TFM_Command } Location sender_pos = sender_p.getLocation(); - for (Player player: sender_pos.getWorld().getPlayers()) + for (Player p : sender_pos.getWorld().getPlayers()) { - if (!player.equals(sender_p)) + if (!p.equals(sender_p)) { - Location target_pos = player.getLocation(); + Location target_pos = p.getLocation(); boolean in_range = false; try { in_range = target_pos.distanceSquared(sender_pos) < (radius * radius); } - catch (IllegalArgumentException e) + catch (IllegalArgumentException ex) { } if (in_range) { - player.setVelocity(target_pos.clone().subtract(sender_pos).toVector().normalize().multiply(strength)); - playerMsg("Pushing " + player.getName() + "."); + p.setVelocity(target_pos.clone().subtract(sender_pos).toVector().normalize().multiply(strength)); + playerMsg("Pushing " + p.getName() + "."); } } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java index c353bd97..7bfcdd8a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java @@ -24,9 +24,9 @@ public class Command_explosives extends TFM_Command { TotalFreedomMod.explosiveRadius = Math.max(1.0, Math.min(30.0, Double.parseDouble(args[1]))); } - catch (NumberFormatException e) + catch (NumberFormatException nfex) { - TFM_Util.playerMsg(sender, e.getMessage()); + TFM_Util.playerMsg(sender, nfex.getMessage()); return true; } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java index 9fb37703..6e719261 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java @@ -19,18 +19,18 @@ public class Command_findip extends TFM_Command return false; } - final Player player; + final Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage()); + playerMsg(ex.getMessage()); return true; } - playerMsg("Player IPs: " + StringUtils.join(TFM_UserList.getInstance(TotalFreedomMod.plugin).getEntry(player).getIpAddresses(), ", ")); + playerMsg("Player IPs: " + StringUtils.join(TFM_UserList.getInstance(TotalFreedomMod.plugin).getEntry(p).getIpAddresses(), ", ")); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java index 1ae3ff99..fed62997 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java @@ -62,9 +62,9 @@ public class Command_fr extends TFM_Command TotalFreedomMod.freezePurgeTask.cancel(); } - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.setFrozen(false); } @@ -72,22 +72,22 @@ public class Command_fr extends TFM_Command } else { - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.setFrozen(!playerdata.isFrozen()); - playerMsg(player.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + "."); - playerMsg(player, "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".", ChatColor.AQUA); + playerMsg(p.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + "."); + playerMsg(p, "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".", ChatColor.AQUA); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java index e0db0bd6..367001ec 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java @@ -30,7 +30,7 @@ public class Command_fuckoff extends TFM_Command { fuckoff_range = Math.max(5.0, Math.min(100.0, Double.parseDouble(args[1]))); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java index 806f531f..f32e56af 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java @@ -30,77 +30,77 @@ public class Command_gadmin extends TFM_Command playerMsg("[ Real Name ] : [ Display Name ] - Hash:"); } - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - String hash = player.getUniqueId().toString().substring(0, 4); + String hash = p.getUniqueId().toString().substring(0, 4); if (mode.equals("list")) { sender.sendMessage(ChatColor.GRAY + String.format("[ %s ] : [ %s ] - %s", - player.getName(), - ChatColor.stripColor(player.getDisplayName()), + p.getName(), + ChatColor.stripColor(p.getDisplayName()), hash)); } else if (hash.equalsIgnoreCase(args[1])) { if (mode.equals("kick")) { - TFM_Util.adminAction(sender.getName(), String.format("Kicking: %s.", player.getName()), false); - player.kickPlayer("Kicked by Administrator"); + TFM_Util.adminAction(sender.getName(), String.format("Kicking: %s.", p.getName()), false); + p.kickPlayer("Kicked by Administrator"); } else if (mode.equals("nameban")) { - TFM_ServerInterface.banUsername(player.getName(), null, null, null); - TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s.", player.getName()), true); - player.kickPlayer("Username banned by Administrator."); + TFM_ServerInterface.banUsername(p.getName(), null, null, null); + TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s.", p.getName()), true); + p.kickPlayer("Username banned by Administrator."); } else if (mode.equals("ipban")) { - String user_ip = player.getAddress().getAddress().getHostAddress(); + String user_ip = p.getAddress().getAddress().getHostAddress(); String[] ip_parts = user_ip.split("\\."); if (ip_parts.length == 4) { user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]); } - TFM_Util.adminAction(sender.getName(), String.format("Banning IP: %s.", player.getName(), user_ip), true); + TFM_Util.adminAction(sender.getName(), String.format("Banning IP: %s.", p.getName(), user_ip), true); TFM_ServerInterface.banIP(user_ip, null, null, null); - player.kickPlayer("IP address banned by Administrator."); + p.kickPlayer("IP address banned by Administrator."); } else if (mode.equals("ban")) { - String user_ip = player.getAddress().getAddress().getHostAddress(); + String user_ip = p.getAddress().getAddress().getHostAddress(); String[] ip_parts = user_ip.split("\\."); if (ip_parts.length == 4) { user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]); } - TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s, IP: %s.", player.getName(), user_ip), true); + TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s, IP: %s.", p.getName(), user_ip), true); TFM_ServerInterface.banIP(user_ip, null, null, null); - TFM_ServerInterface.banUsername(player.getName(), null, null, null); - player.kickPlayer("IP and username banned by Administrator."); + TFM_ServerInterface.banUsername(p.getName(), null, null, null); + p.kickPlayer("IP and username banned by Administrator."); } else if (mode.equals("op")) { - TFM_Util.adminAction(sender.getName(), String.format("Opping %s.", player.getName()), false); - player.setOp(false); - player.sendMessage(TotalFreedomMod.YOU_ARE_OP); + TFM_Util.adminAction(sender.getName(), String.format("Opping %s.", p.getName()), false); + p.setOp(false); + p.sendMessage(TotalFreedomMod.YOU_ARE_OP); } else if (mode.equals("deop")) { - TFM_Util.adminAction(sender.getName(), String.format("Deopping %s.", player.getName()), false); - player.setOp(false); - player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); + TFM_Util.adminAction(sender.getName(), String.format("Deopping %s.", p.getName()), false); + p.setOp(false); + p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); } else if (mode.equals("ci")) { - player.getInventory().clear(); + p.getInventory().clear(); } else if (mode.equals("fr")) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.setFrozen(!playerdata.isFrozen()); - playerMsg(player.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + "."); - player.sendMessage(ChatColor.AQUA + "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + "."); + playerMsg(p.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + "."); + p.sendMessage(ChatColor.AQUA + "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + "."); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java index e7dfd5b6..288af92f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java @@ -17,14 +17,14 @@ public class Command_gcmd extends TFM_Command return false; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } @@ -38,16 +38,16 @@ public class Command_gcmd extends TFM_Command } outcommand = outcommand_bldr.toString().trim(); } - catch (Throwable e) + catch (Throwable ex) { - sender.sendMessage(ChatColor.GRAY + "Error building command: " + e.getMessage()); + sender.sendMessage(ChatColor.GRAY + "Error building command: " + ex.getMessage()); return true; } try { - playerMsg("Sending command as " + player.getName() + ": " + outcommand); - if (server.dispatchCommand(player, outcommand)) + playerMsg("Sending command as " + p.getName() + ": " + outcommand); + if (server.dispatchCommand(p, outcommand)) { playerMsg("Command sent."); } @@ -56,9 +56,9 @@ public class Command_gcmd extends TFM_Command playerMsg("Unknown error sending command."); } } - catch (Throwable e) + catch (Throwable ex) { - playerMsg("Error sending command: " + e.getMessage()); + playerMsg("Error sending command: " + ex.getMessage()); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java index 3e84c0da..ba2ba4f9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java @@ -51,12 +51,12 @@ public class Command_glist extends TFM_Command try { - Player player = getPlayer(args[1]); + Player p = getPlayer(args[1]); - username = player.getName(); - ip_addresses.add(player.getAddress().getAddress().getHostAddress()); + username = p.getName(); + ip_addresses.add(p.getAddress().getAddress().getHostAddress()); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { TFM_UserListEntry entry = TFM_UserList.getInstance(plugin).getEntry(args[1]); @@ -75,11 +75,11 @@ public class Command_glist extends TFM_Command { TFM_Util.adminAction(sender.getName(), "Banning " + username + " and IPs: " + StringUtils.join(ip_addresses, ","), true); - Player player = server.getPlayerExact(username); - if (player != null) + Player p = server.getPlayerExact(username); + if (p != null) { - TFM_ServerInterface.banUsername(player.getName(), null, null, null); - player.kickPlayer("You have been banned by " + sender.getName() + "\n If you think you have been banned wrongly, appeal here: http://www.totalfreedom.boards.net"); + TFM_ServerInterface.banUsername(p.getName(), null, null, null); + p.kickPlayer("You have been banned by " + sender.getName() + "\n If you think you have been banned wrongly, appeal here: http://www.totalfreedom.boards.net"); } else { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java index d97c022d..6c70ac53 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java @@ -25,14 +25,14 @@ public class Command_gtfo extends TFM_Command return false; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } @@ -42,25 +42,25 @@ public class Command_gtfo extends TFM_Command ban_reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " "); } - TFM_Util.bcastMsg(player.getName() + " has been a VERY naughty, naughty boy.", ChatColor.RED); + TFM_Util.bcastMsg(p.getName() + " has been a VERY naughty, naughty boy.", ChatColor.RED); // Undo WorldEdits: - TFM_WorldEditBridge.getInstance().undo(player, 15); + TFM_WorldEditBridge.getInstance().undo(p, 15); // rollback - TFM_RollbackManager.rollback(player.getName()); + TFM_RollbackManager.rollback(p.getName()); // deop - player.setOp(false); + p.setOp(false); // set gamemode to survival: - player.setGameMode(GameMode.SURVIVAL); + p.setGameMode(GameMode.SURVIVAL); // clear inventory: - player.getInventory().clear(); + p.getInventory().clear(); // strike with lightning effect: - final Location target_pos = player.getLocation(); + final Location target_pos = p.getLocation(); for (int x = -1; x <= 1; x++) { for (int z = -1; z <= 1; z++) @@ -71,20 +71,20 @@ public class Command_gtfo extends TFM_Command } // ban IP address: - String user_ip = player.getAddress().getAddress().getHostAddress(); + String user_ip = p.getAddress().getAddress().getHostAddress(); String[] ip_parts = user_ip.split("\\."); if (ip_parts.length == 4) { user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]); } - TFM_Util.bcastMsg(String.format("Banning: %s, IP: %s.", player.getName(), user_ip), ChatColor.RED); + TFM_Util.bcastMsg(String.format("Banning: %s, IP: %s.", p.getName(), user_ip), ChatColor.RED); TFM_ServerInterface.banIP(user_ip, ban_reason, null, null); // ban username: - TFM_ServerInterface.banUsername(player.getName(), ban_reason, null, null); + TFM_ServerInterface.banUsername(p.getName(), ban_reason, null, null); // kick Player: - player.kickPlayer(ChatColor.RED + "GTFO" + (ban_reason != null ? ("\nReason: " + ChatColor.YELLOW + ban_reason) : "")); + p.kickPlayer(ChatColor.RED + "GTFO" + (ban_reason != null ? ("\nReason: " + ChatColor.YELLOW + ban_reason) : "")); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java index 6995281b..fe3f50cd 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java @@ -23,11 +23,11 @@ public class Command_halt extends TFM_Command { TFM_Util.adminAction(sender.getName(), "Halting all non-superadmins.", true); int counter = 0; - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { - TFM_PlayerData.getPlayerData(player).setHalted(true); + TFM_PlayerData.getPlayerData(p).setHalted(true); counter++; } } @@ -39,10 +39,10 @@ public class Command_halt extends TFM_Command { TFM_Util.adminAction(sender.getName(), "Unhalting all players.", true); int counter = 0; - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); - if (TFM_PlayerData.getPlayerData(player).isHalted()) + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); + if (TFM_PlayerData.getPlayerData(p).isHalted()) { playerdata.setHalted(false); counter++; @@ -76,28 +76,28 @@ public class Command_halt extends TFM_Command return true; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); if (!playerdata.isHalted()) { - TFM_Util.adminAction(sender.getName(), "Halting " + player.getName(), true); + TFM_Util.adminAction(sender.getName(), "Halting " + p.getName(), true); playerdata.setHalted(true); return true; } else { - TFM_Util.adminAction(sender.getName(), "Unhalting " + player.getName(), true); + TFM_Util.adminAction(sender.getName(), "Unhalting " + p.getName(), true); playerdata.setHalted(false); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java index 9b1f0e62..c3c2d8a0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java @@ -51,9 +51,9 @@ public class Command_health extends TFM_Command } }.runTask(plugin); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } }.runTaskAsynchronously(plugin); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java index 1b4c9a42..13ec235f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java @@ -33,14 +33,14 @@ public class Command_invis extends TFM_Command List players = new ArrayList(); int smites = 0; - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (player.hasPotionEffect(PotionEffectType.INVISIBILITY)) + if (p.hasPotionEffect(PotionEffectType.INVISIBILITY)) { - players.add(player.getName()); - if (smite && !TFM_SuperadminList.isUserSuperadmin(player)) + players.add(p.getName()); + if (smite && !TFM_SuperadminList.isUserSuperadmin(p)) { - Command_smite.smite(player); + Command_smite.smite(p); smites++; } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_jumppads.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_jumppads.java index 46da10ba..d56c7bf1 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_jumppads.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_jumppads.java @@ -68,7 +68,7 @@ public class Command_jumppads extends TFM_Command { strength = Float.parseFloat(args[1]); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { playerMsg("Invalid Strength"); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java index e3b37574..3bec0247 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java @@ -16,11 +16,11 @@ public class Command_kicknoob extends TFM_Command { TFM_Util.adminAction(sender.getName(), "Disconnecting all non-superadmins.", true); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { - player.kickPlayer(ChatColor.RED + "Disconnected by admin."); + p.kickPlayer(ChatColor.RED + "Disconnected by admin."); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java index c113242a..98c1152b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java @@ -34,7 +34,7 @@ public class Command_landmine extends TFM_Command { radius = Math.max(2.0, Math.min(6.0, Double.parseDouble(args[0]))); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java index 53f5263a..b17b0cf4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java @@ -18,18 +18,18 @@ public class Command_lastcmd extends TFM_Command return false; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); if (playerdata != null) { @@ -38,7 +38,7 @@ public class Command_lastcmd extends TFM_Command { last_command = "(none)"; } - playerMsg(player.getName() + " - Last Command: " + last_command, ChatColor.GRAY); + playerMsg(p.getName() + " - Last Command: " + last_command, ChatColor.GRAY); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java index f984b238..f0f19855 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java @@ -25,9 +25,9 @@ public class Command_list extends TFM_Command if (TFM_Util.isFromHostConsole(sender.getName())) { List player_names = new ArrayList(); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - player_names.add(player.getName()); + player_names.add(p.getName()); } playerMsg("There are " + player_names.size() + "/" + server.getMaxPlayers() + " players online:\n" + StringUtils.join(player_names, ", "), ChatColor.WHITE); return true; @@ -50,9 +50,9 @@ public class Command_list extends TFM_Command onlineStats.append(ChatColor.BLUE).append(" players online."); List player_names = new ArrayList(); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - boolean userSuperadmin = TFM_SuperadminList.isUserSuperadmin(player); + boolean userSuperadmin = TFM_SuperadminList.isUserSuperadmin(p); if (listFilter == ListFilter.SHOW_ADMINS && !userSuperadmin) { @@ -63,7 +63,7 @@ public class Command_list extends TFM_Command if (userSuperadmin) { - if (TFM_SuperadminList.isSeniorAdmin(player)) + if (TFM_SuperadminList.isSeniorAdmin(p)) { prefix = (ChatColor.LIGHT_PURPLE + "[SrA]"); } @@ -72,25 +72,25 @@ public class Command_list extends TFM_Command prefix = (ChatColor.GOLD + "[SA]"); } - if (TFM_Util.DEVELOPERS.contains(player.getName())) + if (TFM_Util.DEVELOPERS.contains(p.getName())) { prefix = (ChatColor.DARK_PURPLE + "[Dev]"); } - if (player.getName().equals("markbyron")) + if (p.getName().equals("markbyron")) { prefix = (ChatColor.BLUE + "[Owner]"); } } else { - if (player.isOp()) + if (p.isOp()) { prefix = (ChatColor.RED + "[OP]"); } } - player_names.add(prefix + player.getName() + ChatColor.WHITE); + player_names.add(prefix + p.getName() + ChatColor.WHITE); } onlineUsers.append("Connected ").append(listFilter == ListFilter.SHOW_ADMINS ? "admins" : "players").append(": ").append(StringUtils.join(player_names, ", ")); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java index 0eb41ab7..f0e24bac 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java @@ -23,9 +23,9 @@ public class Command_listsync extends TFM_Command TotalFreedomMod.loadSuperadminConfig(); TFM_Util.adminAction(sender.getName(), TotalFreedomMod.SUPERADMIN_FILE + " downloaded.", false); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } try @@ -34,9 +34,9 @@ public class Command_listsync extends TFM_Command TotalFreedomMod.loadPermbanConfig(); TFM_Util.adminAction(sender.getName(), TotalFreedomMod.PERMBAN_FILE + " downloaded.", false); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java index 8a234a2c..902374db 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java @@ -21,18 +21,18 @@ public class Command_lockup extends TFM_Command { TFM_Util.adminAction(sender.getName(), "Locking up all players", true); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - startLockup(player); + startLockup(p); } playerMsg("Locked up all players."); } else if (args[0].equalsIgnoreCase("purge")) { TFM_Util.adminAction(sender.getName(), "Unlocking all players", true); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - cancelLockup(player); + cancelLockup(p); } playerMsg("Unlocked all players."); @@ -46,37 +46,37 @@ public class Command_lockup extends TFM_Command { if (args[1].equalsIgnoreCase("on")) { - final Player player; + final Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } - TFM_Util.adminAction(sender.getName(), "Locking up " + player.getName(), true); - startLockup(player); - playerMsg("Locked up " + player.getName() + "."); + TFM_Util.adminAction(sender.getName(), "Locking up " + p.getName(), true); + startLockup(p); + playerMsg("Locked up " + p.getName() + "."); } else if (TFM_Util.isStopCommand(args[1])) { - final Player player; + final Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } - TFM_Util.adminAction(sender.getName(), "Unlocking " + player.getName(), true); - cancelLockup(player); - playerMsg("Unlocked " + player.getName() + "."); + TFM_Util.adminAction(sender.getName(), "Unlocking " + p.getName(), true); + cancelLockup(p); + playerMsg("Unlocked " + p.getName() + "."); } else { @@ -101,14 +101,14 @@ public class Command_lockup extends TFM_Command } } - private void cancelLockup(final Player player) + private void cancelLockup(final Player p) { - cancelLockup(TFM_PlayerData.getPlayerData(player)); + cancelLockup(TFM_PlayerData.getPlayerData(p)); } - private void startLockup(final Player player) + private void startLockup(final Player p) { - final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); cancelLockup(playerdata); @@ -117,9 +117,9 @@ public class Command_lockup extends TFM_Command @Override public void run() { - if (player.isOnline()) + if (p.isOnline()) { - player.openInventory(player.getInventory()); + p.openInventory(p.getInventory()); } else { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java index a5f2528f..f1241ee9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java @@ -102,9 +102,9 @@ public class Command_logs extends TFM_Command }.runTask(TotalFreedomMod.plugin); } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } }.runTaskAsynchronously(TotalFreedomMod.plugin); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java index 49ec8fcb..b600c881 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java @@ -38,7 +38,7 @@ public class Command_nf extends TFM_Command { player = getPlayerByDisplayName(displayName); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { } if (player == null) @@ -47,7 +47,7 @@ public class Command_nf extends TFM_Command { player = getPlayerByDisplayNameAlt(displayName); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { sender.sendMessage(ChatColor.GRAY + "Can't find player by nickname: " + displayName); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java index 819861f4..1ccd9547 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java @@ -43,9 +43,9 @@ public class Command_onlinemode extends TFM_Command if (online_mode) { - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - player.kickPlayer("Server is activating \"online-mode=true\". Please reconnect."); + p.kickPlayer("Server is activating \"online-mode=true\". Please reconnect."); } } @@ -53,9 +53,9 @@ public class Command_onlinemode extends TFM_Command server.reload(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java index f92b3434..864743af 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java @@ -26,21 +26,21 @@ public class Command_op extends TFM_Command return true; } - OfflinePlayer player = null; + OfflinePlayer p = null; for (Player onlinePlayer : server.getOnlinePlayers()) { if (args[0].equalsIgnoreCase(onlinePlayer.getName())) { - player = onlinePlayer; + p = onlinePlayer; } } // if the player is not online - if (player == null) + if (p == null) { if (TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole) { - player = server.getOfflinePlayer(args[0]); + p = server.getOfflinePlayer(args[0]); } else { @@ -50,8 +50,8 @@ public class Command_op extends TFM_Command } } - TFM_Util.adminAction(sender.getName(), "Opping " + player.getName(), false); - player.setOp(true); + TFM_Util.adminAction(sender.getName(), "Opping " + p.getName(), false); + p.setOp(true); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java index 7195d880..c9581820 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java @@ -32,14 +32,14 @@ public class Command_opall extends TFM_Command } } - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - player.setOp(true); - player.sendMessage(TotalFreedomMod.YOU_ARE_OP); + p.setOp(true); + p.sendMessage(TotalFreedomMod.YOU_ARE_OP); if (doSetGamemode) { - player.setGameMode(targetGamemode); + p.setGameMode(targetGamemode); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java index 5c38ef9a..134aaeb6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java @@ -31,9 +31,9 @@ public class Command_ops extends TFM_Command int offlineOPs = 0; int totalOPs = 0; - for (OfflinePlayer player: server.getOperators()) + for (OfflinePlayer p : server.getOperators()) { - if (player.isOnline()) + if (p.isOnline()) { onlineOPs++; } @@ -61,13 +61,13 @@ public class Command_ops extends TFM_Command TFM_Util.adminAction(sender.getName(), "Removing all operators", true); - for (OfflinePlayer player: server.getOperators()) + for (OfflinePlayer p : server.getOperators()) { - player.setOp(false); + p.setOp(false); - if (player.isOnline()) + if (p.isOnline()) { - player.getPlayer().sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); + p.getPlayer().sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java index d333fe8c..aa4336e8 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java @@ -21,18 +21,18 @@ public class Command_orbit extends TFM_Command return false; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); double strength = 10.0; @@ -40,7 +40,7 @@ public class Command_orbit extends TFM_Command { if (TFM_Util.isStopCommand(args[1])) { - playerMsg("Stopped orbiting " + player.getName()); + playerMsg("Stopped orbiting " + p.getName()); playerdata.stopOrbiting(); return true; } @@ -49,18 +49,18 @@ public class Command_orbit extends TFM_Command { strength = Math.max(1.0, Math.min(150.0, Double.parseDouble(args[1]))); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } } - player.setGameMode(GameMode.SURVIVAL); + p.setGameMode(GameMode.SURVIVAL); playerdata.startOrbiting(strength); - player.setVelocity(new Vector(0, strength, 0)); - TFM_Util.adminAction(sender.getName(), "Orbiting " + player.getName() + ".", false); + p.setVelocity(new Vector(0, strength, 0)); + TFM_Util.adminAction(sender.getName(), "Orbiting " + p.getName() + ".", false); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java index 7b722117..aea04b27 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java @@ -58,20 +58,20 @@ public class Command_plugincontrol extends TFM_Command else if (commandMode == CommandMode.RELOAD) { playerMsg("Disabling all plugins."); - for (Plugin target_plugin : pluginManager.getPlugins()) + for (Plugin p : pluginManager.getPlugins()) { - if (!target_plugin.getName().toLowerCase().startsWith("totalfreedommod")) + if (!p.getName().toLowerCase().startsWith("totalfreedommod")) { - pluginManager.disablePlugin(target_plugin); + pluginManager.disablePlugin(p); } } playerMsg("Enabling all plugins."); - for (Plugin target_plugin : pluginManager.getPlugins()) + for (Plugin p : pluginManager.getPlugins()) { - if (!target_plugin.getName().toLowerCase().startsWith("totalfreedommod")) + if (!p.getName().toLowerCase().startsWith("totalfreedommod")) { - pluginManager.enablePlugin(target_plugin); + pluginManager.enablePlugin(p); } } } @@ -81,11 +81,11 @@ public class Command_plugincontrol extends TFM_Command Plugin targetPlugin = null; - for (Plugin target_plugin : pluginManager.getPlugins()) + for (Plugin p : pluginManager.getPlugins()) { - if (searchPluginName.equalsIgnoreCase(target_plugin.getName().toLowerCase().trim())) + if (searchPluginName.equalsIgnoreCase(p.getName().toLowerCase().trim())) { - targetPlugin = plugin; + targetPlugin = p; break; } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java index 362bf1ec..1dc42ec4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java @@ -62,9 +62,9 @@ public class Command_potion extends TFM_Command { target = getPlayer(args[1]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } } @@ -107,9 +107,9 @@ public class Command_potion extends TFM_Command { target = getPlayer(args[4]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } } @@ -140,7 +140,7 @@ public class Command_potion extends TFM_Command { duration = Integer.parseInt(args[2]); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { playerMsg("Invalid potion duration.", ChatColor.RED); return true; @@ -151,7 +151,7 @@ public class Command_potion extends TFM_Command { amplifier = Integer.parseInt(args[3]); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { playerMsg("Invalid potion amplifier.", ChatColor.RED); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java deleted file mode 100644 index 75c92b44..00000000 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java +++ /dev/null @@ -1,72 +0,0 @@ -package me.StevenLawson.TotalFreedomMod.Commands; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import me.StevenLawson.TotalFreedomMod.TFM_Log; -import org.apache.commons.lang.exception.ExceptionUtils; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; - -@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH) -@CommandParameters(description = "Validates if a given account is premium.", usage = "/ ", aliases = "prem") -public class Command_premium extends TFM_Command -{ - @Override - public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (args.length != 1) - { - return false; - } - - String name; - try - { - name = getPlayer(args[0]).getName(); - } - catch (PlayerNotFoundException e) - { - name = args[0]; - } - - final String playername = name; - new BukkitRunnable() - { - @Override - public void run() - { - try - { - final URL getUrl = new URL("https://minecraft.net/haspaid.jsp?user=" + playername); - final URLConnection urlConnection = getUrl.openConnection(); - // Read the response - final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())); - final String message = ("false".equalsIgnoreCase(in.readLine()) ? ChatColor.RED + "No" : ChatColor.DARK_GREEN + "Yes"); - in.close(); - - new BukkitRunnable() - { - @Override - public void run() - { - playerMsg("Player " + playername + " is premium: " + message); - } - }.runTask(plugin); - - } - catch (Exception e) - { - TFM_Log.severe(ExceptionUtils.getStackTrace(e)); - playerMsg("There was an error querying the mojang server.", ChatColor.RED); - } - } - }.runTaskAsynchronously(plugin); - - return true; - } -} diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java index b26f7305..6cc86eeb 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java @@ -24,9 +24,9 @@ public class Command_purgeall extends TFM_Command // Undisguise all players TFM_DisguiseCraftBridge.undisguiseAllPlayers(); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); // Unmute all players if (playerdata.isMuted()) @@ -59,9 +59,9 @@ public class Command_purgeall extends TFM_Command } // Purge potion effects - for (PotionEffect potion_effect : player.getActivePotionEffects()) + for (PotionEffect potion_effect : p.getActivePotionEffects()) { - player.removePotionEffect(potion_effect.getType()); + p.removePotionEffect(potion_effect.getType()); } // Uncage diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java index a7c5bf10..d680816c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java @@ -28,18 +28,18 @@ public class Command_qdeop extends TFM_Command String target_name = args[0].toLowerCase(); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (player.getName().toLowerCase().indexOf(target_name) != -1 || player.getDisplayName().toLowerCase().indexOf(target_name) != -1) + if (p.getName().toLowerCase().indexOf(target_name) != -1 || p.getDisplayName().toLowerCase().indexOf(target_name) != -1) { matched_player = true; if (!silent) { - TFM_Util.adminAction(sender.getName(), "De-opping " + player.getName(), false); + TFM_Util.adminAction(sender.getName(), "De-opping " + p.getName(), false); } - player.setOp(false); - player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); + p.setOp(false); + p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java index c7afe9d0..867943e6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java @@ -28,18 +28,18 @@ public class Command_qop extends TFM_Command String target_name = args[0].toLowerCase(); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (player.getName().toLowerCase().indexOf(target_name) != -1 || player.getDisplayName().toLowerCase().indexOf(target_name) != -1) + if (p.getName().toLowerCase().indexOf(target_name) != -1 || p.getDisplayName().toLowerCase().indexOf(target_name) != -1) { matched_player = true; if (!silent) { - TFM_Util.adminAction(sender.getName(), "Opping " + player.getName(), false); + TFM_Util.adminAction(sender.getName(), "Opping " + p.getName(), false); } - player.setOp(true); - player.sendMessage(TotalFreedomMod.YOU_ARE_OP); + p.setOp(true); + p.sendMessage(TotalFreedomMod.YOU_ARE_OP); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java index 5a449a7a..a2bc5053 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java @@ -21,15 +21,15 @@ public class Command_radar extends TFM_Command List radar_data = new ArrayList(); - for (Player player : sender_pos.getWorld().getPlayers()) + for (Player p : sender_pos.getWorld().getPlayers()) { - if (!player.equals(sender_p)) + if (!p.equals(sender_p)) { try { - radar_data.add(new TFM_RadarData(player, sender_pos.distance(player.getLocation()), player.getLocation())); + radar_data.add(new TFM_RadarData(p, sender_pos.distance(p.getLocation()), p.getLocation())); } - catch (IllegalArgumentException e) + catch (IllegalArgumentException ex) { } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java index 2da7c248..a93138bb 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java @@ -15,9 +15,9 @@ public class Command_rank extends TFM_Command { if (senderIsConsole && args.length < 1) { - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - playerMsg(player.getName() + " is " + TFM_Util.getRank(player)); + playerMsg(p.getName() + " is " + TFM_Util.getRank(p)); } return true; } @@ -33,18 +33,18 @@ public class Command_rank extends TFM_Command return true; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } - playerMsg(player.getName() + " is " + TFM_Util.getRank(player), ChatColor.AQUA); + playerMsg(p.getName() + " is " + TFM_Util.getRank(p), ChatColor.AQUA); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java index c1abadac..bfc34725 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java @@ -26,7 +26,7 @@ public class Command_ro extends TFM_Command { from_material = Material.getMaterial(Integer.parseInt(args[0])); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { } @@ -44,7 +44,7 @@ public class Command_ro extends TFM_Command { radius = Math.max(1, Math.min(50, Integer.parseInt(args[1]))); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { playerMsg("Invalid radius: " + args[1], ChatColor.RED); return true; @@ -58,9 +58,9 @@ public class Command_ro extends TFM_Command { target_player = getPlayer(args[2]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } } @@ -70,9 +70,9 @@ public class Command_ro extends TFM_Command if (target_player == null) { TFM_Util.adminAction(sender.getName(), "Removing all " + from_material.name() + " within " + radius + " blocks of all players. Brace for lag...", senderIsConsole); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - affected += TFM_Util.replaceBlocks(player.getLocation(), from_material, Material.AIR, radius); + affected += TFM_Util.replaceBlocks(p.getLocation(), from_material, Material.AIR, radius); } } else diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java index 74f59f5d..5c9785f5 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java @@ -60,7 +60,7 @@ public class Command_rollback extends TFM_Command playerName = player.getName(); } } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java index 83d35fda..5e1c7e50 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java @@ -66,7 +66,7 @@ public class Command_saconfig extends TFM_Command { superadmin = TFM_SuperadminList.getAdminEntry(getPlayer(args[1]).getName().toLowerCase()); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { } } @@ -91,14 +91,14 @@ public class Command_saconfig extends TFM_Command if (args[0].equalsIgnoreCase("add")) { - Player player = null; + Player p = null; String admin_name = null; try { - player = getPlayer(args[1]); + p = getPlayer(args[1]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { TFM_Superadmin superadmin = TFM_SuperadminList.getAdminEntry(args[1].toLowerCase()); if (superadmin != null) @@ -107,15 +107,15 @@ public class Command_saconfig extends TFM_Command } else { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } } - if (player != null) + if (p != null) { - TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list.", true); - TFM_SuperadminList.addSuperadmin(player); + TFM_Util.adminAction(sender.getName(), "Adding " + p.getName() + " to the superadmin list.", true); + TFM_SuperadminList.addSuperadmin(p); } else if (admin_name != null) { @@ -137,7 +137,7 @@ public class Command_saconfig extends TFM_Command { target_name = getPlayer(target_name).getName(); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java index 5aef9f49..f5f60935 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java @@ -27,9 +27,9 @@ public class Command_say extends TFM_Command { TFM_Util.bcastMsg("Server is going offline.", ChatColor.GRAY); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - player.kickPlayer("Server is going offline, come back in a few minutes."); + p.kickPlayer("Server is going offline, come back in a few minutes."); } server.shutdown(); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setl.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setl.java index 7fcdedaf..f8fe4858 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setl.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setl.java @@ -15,9 +15,9 @@ public class Command_setl extends TFM_Command { TFM_Util.adminAction(sender.getName(), "Setting everyone's Worldedit block modification limit to 500.", true); TFM_WorldEditBridge web = TFM_WorldEditBridge.getInstance(); - for (final Player player: server.getOnlinePlayers()) + for (final Player p : server.getOnlinePlayers()) { - web.setLimit(player, 500); + web.setLimit(p, 500); } return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java index 39f5a2a8..9ff84c53 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java @@ -32,7 +32,7 @@ public class Command_setlevel extends TFM_Command new_level = 50; } } - catch (NumberFormatException e) + catch (NumberFormatException ex) { playerMsg("Invalid level.", ChatColor.RED); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java index ab016bcf..b165ba1d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java @@ -21,38 +21,38 @@ public class Command_smite extends TFM_Command return false; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } - smite(player); + smite(p); return true; } - public static void smite(final Player player) + public static void smite(final Player p) { - TFM_Util.bcastMsg(player.getName() + " has been a naughty, naughty boy.", ChatColor.RED); + TFM_Util.bcastMsg(p.getName() + " has been a naughty, naughty boy.", ChatColor.RED); //Deop - player.setOp(false); + p.setOp(false); //Set gamemode to survival: - player.setGameMode(GameMode.SURVIVAL); + p.setGameMode(GameMode.SURVIVAL); //Clear inventory: - player.getInventory().clear(); + p.getInventory().clear(); //Strike with lightning effect: - final Location target_pos = player.getLocation(); - final World world = player.getWorld(); + final Location target_pos = p.getLocation(); + final World world = p.getWorld(); for (int x = -1; x <= 1; x++) { for (int z = -1; z <= 1; z++) @@ -63,6 +63,6 @@ public class Command_smite extends TFM_Command } //Kill: - player.setHealth(0.0); + p.setHealth(0.0); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java index efb90363..9acd1cb3 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java @@ -66,11 +66,11 @@ public class Command_stfu extends TFM_Command TFM_PlayerData playerdata; int counter = 0; - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { - playerdata = TFM_PlayerData.getPlayerData(player); + playerdata = TFM_PlayerData.getPlayerData(p); playerdata.setMuted(true); counter++; } @@ -87,9 +87,9 @@ public class Command_stfu extends TFM_Command public void run() { TFM_Util.adminAction("MuteTimer", "Unmuting all players", false); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - TFM_PlayerData.getPlayerData(player).setMuted(false); + TFM_PlayerData.getPlayerData(p).setMuted(false); } } }.runTaskLater(plugin, 20L * 60L * 5L); @@ -98,35 +98,35 @@ public class Command_stfu extends TFM_Command } else { - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - sender.sendMessage(e.getMessage()); + sender.sendMessage(ex.getMessage()); return true; } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); if (playerdata.isMuted()) { - TFM_Util.adminAction(sender.getName(), "Unmuting " + player.getName(), true); + TFM_Util.adminAction(sender.getName(), "Unmuting " + p.getName(), true); playerdata.setMuted(false); - playerMsg("Unmuted " + player.getName()); + playerMsg("Unmuted " + p.getName()); } else { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { - TFM_Util.adminAction(sender.getName(), "Muting " + player.getName(), true); + TFM_Util.adminAction(sender.getName(), "Muting " + p.getName(), true); playerdata.setMuted(true); - playerMsg("Muted " + player.getName()); + playerMsg("Muted " + p.getName()); } else { - playerMsg(player.getName() + " is a superadmin, and can't be muted."); + playerMsg(p.getName() + " is a superadmin, and can't be muted."); } } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java index 974ef917..711d5019 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java @@ -15,9 +15,9 @@ public class Command_stop extends TFM_Command { TFM_Util.bcastMsg("Server is going offline!", ChatColor.LIGHT_PURPLE); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - player.kickPlayer("Server is going offline, come back in about 20 seconds."); + p.kickPlayer("Server is going offline, come back in about 20 seconds."); } server.shutdown(); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java index 59c616f6..4fb67b72 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java @@ -26,11 +26,11 @@ public class Command_survival extends TFM_Command } } - Player player; + Player p; if (args.length == 0) { - player = sender_p; + p = sender_p; } else { @@ -42,9 +42,9 @@ public class Command_survival extends TFM_Command return true; } - for (Player target : server.getOnlinePlayers()) + for (Player player : server.getOnlinePlayers()) { - target.setGameMode(GameMode.SURVIVAL); + player.setGameMode(GameMode.SURVIVAL); } TFM_Util.adminAction(sender.getName(), "Changing everyone's gamemode to survival", false); @@ -55,11 +55,11 @@ public class Command_survival extends TFM_Command { try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } } @@ -70,9 +70,9 @@ public class Command_survival extends TFM_Command } } - playerMsg("Setting " + player.getName() + " to game mode 'Survival'."); - player.sendMessage(sender.getName() + " set your game mode to 'Survival'."); - player.setGameMode(GameMode.SURVIVAL); + playerMsg("Setting " + p.getName() + " to game mode 'Survival'."); + p.sendMessage(sender.getName() + " set your game mode to 'Survival'."); + p.setGameMode(GameMode.SURVIVAL); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java index 5a3ba4ed..c788302e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java @@ -35,14 +35,14 @@ public class Command_tag extends TFM_Command TFM_Util.adminAction(sender.getName(), "Removing all tags", false); int count = 0; - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); if (playerdata.getTag() != null) { count++; - TFM_PlayerData.getPlayerData(player).setTag(null); + TFM_PlayerData.getPlayerData(p).setTag(null); } } @@ -104,19 +104,19 @@ public class Command_tag extends TFM_Command return true; } - final Player player; + final Player p; try { - player = getPlayer(args[1]); + p = getPlayer(args[1]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage()); + playerMsg(ex.getMessage()); return true; } - TFM_PlayerData.getPlayerData(player).setTag(null); - playerMsg("Removed " + player.getName() + "'s tag."); + TFM_PlayerData.getPlayerData(p).setTag(null); + playerMsg("Removed " + p.getName() + "'s tag."); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java index 1eec540c..0f8b1114 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java @@ -19,21 +19,21 @@ public class Command_tban extends TFM_Command return false; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } - TFM_Util.adminAction(sender.getName(), "NOPE: " + player.getName(), true); - TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes", + TFM_Util.adminAction(sender.getName(), "NOPE: " + p.getName(), true); + TFM_ServerInterface.banUsername(p.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes", sender.getName(), TFM_Util.parseDateOffset("5m")); - player.kickPlayer(ChatColor.RED + "NOPE!\nYou have been temporarily banned for five minutes."); + p.kickPlayer(ChatColor.RED + "NOPE!\nYou have been temporarily banned for five minutes."); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java index f248c0f9..29d30b73 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java @@ -25,18 +25,18 @@ public class Command_tempban extends TFM_Command return false; } - Player player; + Player p; try { - player = getPlayer(args[0]); + p = getPlayer(args[0]); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - playerMsg(e.getMessage(), ChatColor.RED); + playerMsg(ex.getMessage(), ChatColor.RED); return true; } - StringBuilder bcast_msg = new StringBuilder("Temporarily banned " + player.getName()); + StringBuilder bcast_msg = new StringBuilder("Temporarily banned " + p.getName()); Date ban_duration = TFM_Util.parseDateOffset("30m"); if (args.length >= 2) @@ -57,9 +57,9 @@ public class Command_tempban extends TFM_Command } TFM_Util.adminAction(sender.getName(), bcast_msg.toString(), true); - TFM_ServerInterface.banUsername(player.getName(), ban_reason, sender.getName(), ban_duration); - TFM_ServerInterface.banIP(player.getAddress().getAddress().getHostAddress().trim(), ban_reason, sender.getName(), ban_duration); - player.kickPlayer(sender.getName() + " - " + bcast_msg.toString()); + TFM_ServerInterface.banUsername(p.getName(), ban_reason, sender.getName(), ban_duration); + TFM_ServerInterface.banIP(p.getAddress().getAddress().getHostAddress().trim(), ban_reason, sender.getName(), ban_duration); + p.kickPlayer(sender.getName() + " - " + bcast_msg.toString()); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java index 0c0948c1..e88989c9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java @@ -29,9 +29,9 @@ public class Command_tfbanlist extends TFM_Command TFM_ServerInterface.wipeNameBans(); sender.sendMessage(ChatColor.GRAY + "Ban list has been purged."); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return true; @@ -46,14 +46,14 @@ public class Command_tfbanlist extends TFM_Command StringBuilder banned_players = new StringBuilder(); banned_players.append("Banned Players: "); boolean first = true; - for (OfflinePlayer player: server.getBannedPlayers()) + for (OfflinePlayer p : server.getBannedPlayers()) { if (!first) { banned_players.append(", "); } first = false; - banned_players.append(player.getName().trim()); + banned_players.append(p.getName().trim()); } playerMsg(banned_players.toString()); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java index 05d34027..25bde4f0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java @@ -29,9 +29,9 @@ public class Command_tfipbanlist extends TFM_Command TFM_ServerInterface.wipeIpBans(); sender.sendMessage(ChatColor.GRAY + "IP ban list has been purged."); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java index 248be9b0..ba68554a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java @@ -57,9 +57,9 @@ public class Command_tfupdate extends TFM_Command TFM_Util.downloadFile(url, file, true); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } }.runTaskAsynchronously(plugin); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java index ea821e49..b72223c3 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java @@ -47,7 +47,7 @@ public class Command_tossmob extends TFM_Command { creature = TFM_Util.getEntityType(args[0]); } - catch (Exception e) + catch (Exception ex) { playerMsg(args[0] + " is not a supported mob type. Using a pig instead.", ChatColor.RED); playerMsg("By the way, you can type /tossmob list to see all possible mobs.", ChatColor.RED); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java index c54526d5..3474a80e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java @@ -35,9 +35,9 @@ public class Command_whitelist extends TFM_Command int offlineWPs = 0; int totalWPs = 0; - for (OfflinePlayer player: server.getWhitelistedPlayers()) + for (OfflinePlayer p : server.getWhitelistedPlayers()) { - if (player.isOnline()) + if (p.isOnline()) { onlineWPs++; } @@ -88,18 +88,18 @@ public class Command_whitelist extends TFM_Command String search_name = args[1].trim().toLowerCase(); - OfflinePlayer player; + OfflinePlayer p; try { - player = getPlayer(search_name); + p = getPlayer(search_name); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - player = server.getOfflinePlayer(search_name); + p = server.getOfflinePlayer(search_name); } - TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the whitelist.", false); - player.setWhitelisted(true); + TFM_Util.adminAction(sender.getName(), "Adding " + p.getName() + " to the whitelist.", false); + p.setWhitelisted(true); return true; } @@ -113,20 +113,20 @@ public class Command_whitelist extends TFM_Command String search_name = args[1].trim().toLowerCase(); - OfflinePlayer player; + OfflinePlayer p; try { - player = getPlayer(search_name); + p = getPlayer(search_name); } - catch (PlayerNotFoundException e) + catch (PlayerNotFoundException ex) { - player = server.getOfflinePlayer(search_name); + p = server.getOfflinePlayer(search_name); } - if (player.isWhitelisted()) + if (p.isWhitelisted()) { - TFM_Util.adminAction(sender.getName(), "Removing " + player.getName() + " from the whitelist.", false); - player.setWhitelisted(false); + TFM_Util.adminAction(sender.getName(), "Removing " + p.getName() + " from the whitelist.", false); + p.setWhitelisted(false); return true; } else @@ -142,11 +142,11 @@ public class Command_whitelist extends TFM_Command { TFM_Util.adminAction(sender.getName(), "Adding all online players to the whitelist.", false); int counter = 0; - for (Player player : server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (!player.isWhitelisted()) + if (!p.isWhitelisted()) { - player.setWhitelisted(true); + p.setWhitelisted(true); counter++; } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java index 638aa8f0..e617309d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java @@ -39,7 +39,7 @@ public class Command_whohas extends TFM_Command { material = Material.getMaterial(Integer.parseInt(args[0])); } - catch (NumberFormatException e) + catch (NumberFormatException ex) { } @@ -52,14 +52,14 @@ public class Command_whohas extends TFM_Command List players = new ArrayList(); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (player.getInventory().contains(material)) + if (p.getInventory().contains(material)) { - players.add(player.getName()); - if (smite & !TFM_SuperadminList.isUserSuperadmin(player)) + players.add(p.getName()); + if (smite & !TFM_SuperadminList.isUserSuperadmin(p)) { - Command_smite.smite(player); + Command_smite.smite(p); } } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java index bd2d303c..63431743 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java @@ -36,9 +36,9 @@ public class Command_wildcard extends TFM_Command String base_command = StringUtils.join(args, " "); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - String out_command = base_command.replaceAll("\\x3f", player.getName()); + String out_command = base_command.replaceAll("\\x3f", p.getName()); playerMsg("Running Command: " + out_command); server.dispatchCommand(sender, out_command); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java index a622fbfe..9863d8e9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java @@ -17,9 +17,9 @@ public class Command_wipeflatlands extends TFM_Command TFM_Util.bcastMsg("Server is going offline for flatlands wipe.", ChatColor.GRAY); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - player.kickPlayer("Server is going offline for flatlands wipe, come back in a few minutes."); + p.kickPlayer("Server is going offline for flatlands wipe, come back in a few minutes."); } server.shutdown(); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java index 6a5f43ed..9649d92e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java @@ -143,11 +143,11 @@ public abstract class TFM_Command List matches = server.matchPlayer(partialname); if (matches.isEmpty()) { - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - if (player.getDisplayName().toLowerCase().contains(partialname.toLowerCase())) + if (p.getDisplayName().toLowerCase().contains(partialname.toLowerCase())) { - return player; + return p; } } throw new PlayerNotFoundException(partialname); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java index 664bce41..bf9cb832 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java @@ -103,9 +103,9 @@ public class TFM_CommandLoader } } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -176,17 +176,17 @@ public class TFM_CommandLoader commandList.add(commandInfo); } } - catch (ClassNotFoundException e) + catch (ClassNotFoundException ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } } } } - catch (IOException e) + catch (IOException ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return commandList; @@ -292,9 +292,9 @@ public class TFM_CommandLoader { success = getPlugin().onCommand(sender, this, commandLabel, args); } - catch (Throwable e) + catch (Throwable ex) { - throw new CommandException("Unhandled exception executing command '" + commandLabel + "' in plugin " + getPlugin().getDescription().getFullName(), e); + throw new CommandException("Unhandled exception executing command '" + commandLabel + "' in plugin " + getPlugin().getDescription().getFullName(), ex); } if (!success && getUsage().length() > 0) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java index e213ce6a..f224a558 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java @@ -41,14 +41,14 @@ public class TFM_BlockListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onBlockBreak(BlockBreakEvent event) { - Player player = event.getPlayer(); + Player p = event.getPlayer(); Location block_pos = event.getBlock().getLocation(); if (TotalFreedomMod.nukeMonitor) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); - Location player_pos = player.getLocation(); + Location player_pos = p.getLocation(); boolean out_of_range = false; if (!player_pos.getWorld().equals(block_pos.getWorld())) @@ -64,8 +64,8 @@ public class TFM_BlockListener implements Listener { if (playerdata.incrementAndGetFreecamDestroyCount() > TotalFreedomMod.freecamTriggerCount) { - TFM_Util.bcastMsg(player.getName() + " has been flagged for possible freecam nuking.", ChatColor.RED); - TFM_Util.autoEject(player, "Freecam (extended range) block breaking is not permitted on this server."); + TFM_Util.bcastMsg(p.getName() + " has been flagged for possible freecam nuking.", ChatColor.RED); + TFM_Util.autoEject(p, "Freecam (extended range) block breaking is not permitted on this server."); playerdata.resetFreecamDestroyCount(); @@ -83,8 +83,8 @@ public class TFM_BlockListener implements Listener { if (playerdata.incrementAndGetBlockDestroyCount() > TotalFreedomMod.nukeMonitorCountBreak) { - TFM_Util.bcastMsg(player.getName() + " is breaking blocks too fast!", ChatColor.RED); - TFM_Util.autoEject(player, "You are breaking blocks too fast. Nukers are not permitted on this server."); + TFM_Util.bcastMsg(p.getName() + " is breaking blocks too fast!", ChatColor.RED); + TFM_Util.autoEject(p, "You are breaking blocks too fast. Nukers are not permitted on this server."); playerdata.resetBlockDestroyCount(); @@ -96,7 +96,7 @@ public class TFM_BlockListener implements Listener if (TotalFreedomMod.protectedAreasEnabled) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { if (TFM_ProtectedArea.isInProtectedArea(block_pos)) { @@ -115,14 +115,14 @@ public class TFM_BlockListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onBlockPlace(BlockPlaceEvent event) { - Player player = event.getPlayer(); + Player p = event.getPlayer(); Location block_pos = event.getBlock().getLocation(); if (TotalFreedomMod.nukeMonitor) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); - Location player_pos = player.getLocation(); + Location player_pos = p.getLocation(); boolean out_of_range = false; if (!player_pos.getWorld().equals(block_pos.getWorld())) @@ -138,8 +138,8 @@ public class TFM_BlockListener implements Listener { if (playerdata.incrementAndGetFreecamPlaceCount() > TotalFreedomMod.freecamTriggerCount) { - TFM_Util.bcastMsg(player.getName() + " has been flagged for possible freecam building.", ChatColor.RED); - TFM_Util.autoEject(player, "Freecam (extended range) block building is not permitted on this server."); + TFM_Util.bcastMsg(p.getName() + " has been flagged for possible freecam building.", ChatColor.RED); + TFM_Util.autoEject(p, "Freecam (extended range) block building is not permitted on this server."); playerdata.resetFreecamPlaceCount(); @@ -157,8 +157,8 @@ public class TFM_BlockListener implements Listener { if (playerdata.incrementAndGetBlockPlaceCount() > TotalFreedomMod.nukeMonitorCountPlace) { - TFM_Util.bcastMsg(player.getName() + " is placing blocks too fast!", ChatColor.RED); - TFM_Util.autoEject(player, "You are placing blocks too fast."); + TFM_Util.bcastMsg(p.getName() + " is placing blocks too fast!", ChatColor.RED); + TFM_Util.autoEject(p, "You are placing blocks too fast."); playerdata.resetBlockPlaceCount(); @@ -170,7 +170,7 @@ public class TFM_BlockListener implements Listener if (TotalFreedomMod.protectedAreasEnabled) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { if (TFM_ProtectedArea.isInProtectedArea(block_pos)) { @@ -187,14 +187,14 @@ public class TFM_BlockListener implements Listener { if (TotalFreedomMod.allowLavaPlace) { - TFM_Log.info(String.format("%s placed lava @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); + TFM_Log.info(String.format("%s placed lava @ %s", p.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); - player.getInventory().clear(player.getInventory().getHeldItemSlot()); + p.getInventory().clear(p.getInventory().getHeldItemSlot()); } else { - player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); - player.sendMessage(ChatColor.GRAY + "Lava placement is currently disabled."); + p.getInventory().setItem(p.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); + p.sendMessage(ChatColor.GRAY + "Lava placement is currently disabled."); event.setCancelled(true); } @@ -205,14 +205,14 @@ public class TFM_BlockListener implements Listener { if (TotalFreedomMod.allowWaterPlace) { - TFM_Log.info(String.format("%s placed water @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); + TFM_Log.info(String.format("%s placed water @ %s", p.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); - player.getInventory().clear(player.getInventory().getHeldItemSlot()); + p.getInventory().clear(p.getInventory().getHeldItemSlot()); } else { - player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); - player.sendMessage(ChatColor.GRAY + "Water placement is currently disabled."); + p.getInventory().setItem(p.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); + p.sendMessage(ChatColor.GRAY + "Water placement is currently disabled."); event.setCancelled(true); } @@ -222,14 +222,14 @@ public class TFM_BlockListener implements Listener { if (TotalFreedomMod.allowFirePlace) { - TFM_Log.info(String.format("%s placed fire @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); + TFM_Log.info(String.format("%s placed fire @ %s", p.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); - player.getInventory().clear(player.getInventory().getHeldItemSlot()); + p.getInventory().clear(p.getInventory().getHeldItemSlot()); } else { - player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); - player.sendMessage(ChatColor.GRAY + "Fire placement is currently disabled."); + p.getInventory().setItem(p.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); + p.sendMessage(ChatColor.GRAY + "Fire placement is currently disabled."); event.setCancelled(true); } @@ -239,15 +239,15 @@ public class TFM_BlockListener implements Listener { if (TotalFreedomMod.allowExplosions) { - TFM_Log.info(String.format("%s placed TNT @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); + TFM_Log.info(String.format("%s placed TNT @ %s", p.getName(), TFM_Util.formatLocation(event.getBlock().getLocation()))); - player.getInventory().clear(player.getInventory().getHeldItemSlot()); + p.getInventory().clear(p.getInventory().getHeldItemSlot()); } else { - player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); + p.getInventory().setItem(p.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); - player.sendMessage(ChatColor.GRAY + "TNT is currently disabled."); + p.sendMessage(ChatColor.GRAY + "TNT is currently disabled."); event.setCancelled(true); } break; diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index ec1ff9f9..48e54cbf 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -233,7 +233,7 @@ public class TFM_PlayerListener implements Listener return; } } - catch (IllegalArgumentException e) + catch (IllegalArgumentException ex) { } @@ -242,21 +242,21 @@ public class TFM_PlayerListener implements Listener return; } - Player player = event.getPlayer(); - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + Player p = event.getPlayer(); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); for (Entry fuckoff : TotalFreedomMod.fuckoffEnabledFor.entrySet()) { Player fuckoff_player = fuckoff.getKey(); - if (fuckoff_player.equals(player) || !fuckoff_player.isOnline()) + if (fuckoff_player.equals(p) || !fuckoff_player.isOnline()) { continue; } double fuckoff_range = fuckoff.getValue().doubleValue(); - Location mover_pos = player.getLocation(); + Location mover_pos = p.getLocation(); Location fuckoff_pos = fuckoff_player.getLocation(); double distanceSquared; @@ -264,7 +264,7 @@ public class TFM_PlayerListener implements Listener { distanceSquared = mover_pos.distanceSquared(fuckoff_pos); } - catch (IllegalArgumentException e) + catch (IllegalArgumentException ex) { continue; } @@ -279,7 +279,7 @@ public class TFM_PlayerListener implements Listener boolean do_freeze = false; if (TotalFreedomMod.allPlayersFrozen) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { do_freeze = true; } @@ -305,7 +305,7 @@ public class TFM_PlayerListener implements Listener if (playerdata.isCaged()) { - Location target_pos = player.getLocation().add(0, 1, 0); + Location target_pos = p.getLocation().add(0, 1, 0); boolean out_of_cage; if (!target_pos.getWorld().equals(playerdata.getCagePos().getWorld())) @@ -330,9 +330,9 @@ public class TFM_PlayerListener implements Listener if (playerdata.isOrbiting()) { - if (player.getVelocity().length() < playerdata.orbitStrength() * (2.0 / 3.0)) + if (p.getVelocity().length() < playerdata.orbitStrength() * (2.0 / 3.0)) { - player.setVelocity(new Vector(0, playerdata.orbitStrength(), 0)); + p.setVelocity(new Vector(0, playerdata.orbitStrength(), 0)); } } @@ -355,23 +355,23 @@ public class TFM_PlayerListener implements Listener continue; } - if (!landmine.player.equals(player)) + if (!landmine.player.equals(p)) { - if (player.getWorld().equals(landmine_pos.getWorld())) + if (p.getWorld().equals(landmine_pos.getWorld())) { - if (player.getLocation().distanceSquared(landmine_pos) <= (landmine.radius * landmine.radius)) + if (p.getLocation().distanceSquared(landmine_pos) <= (landmine.radius * landmine.radius)) { landmine.landmine_pos.getBlock().setType(Material.AIR); TNTPrimed tnt1 = landmine_pos.getWorld().spawn(landmine_pos, TNTPrimed.class); tnt1.setFuseTicks(40); - tnt1.setPassenger(player); + tnt1.setPassenger(p); tnt1.setVelocity(new Vector(0.0, 2.0, 0.0)); - TNTPrimed tnt2 = landmine_pos.getWorld().spawn(player.getLocation(), TNTPrimed.class); + TNTPrimed tnt2 = landmine_pos.getWorld().spawn(p.getLocation(), TNTPrimed.class); tnt2.setFuseTicks(1); - player.setGameMode(GameMode.SURVIVAL); + p.setGameMode(GameMode.SURVIVAL); landmines.remove(); } } @@ -392,10 +392,10 @@ public class TFM_PlayerListener implements Listener { try { - final Player player = event.getPlayer(); + final Player p = event.getPlayer(); String message = event.getMessage().trim(); - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); // Check for spam Long lastRan = TFM_Heartbeat.getLastRan(); @@ -407,8 +407,8 @@ public class TFM_PlayerListener implements Listener { if (playerdata.incrementAndGetMsgCount() > MSG_PER_HEARTBEAT) { - TFM_Util.bcastMsg(player.getName() + " was automatically kicked for spamming chat.", ChatColor.RED); - TFM_Util.autoEject(player, "Kicked for spamming chat."); + TFM_Util.bcastMsg(p.getName() + " was automatically kicked for spamming chat.", ChatColor.RED); + TFM_Util.autoEject(p, "Kicked for spamming chat."); playerdata.resetMsgCount(); @@ -420,7 +420,7 @@ public class TFM_PlayerListener implements Listener // Check for message repeat if (playerdata.getLastMessage().equalsIgnoreCase(message)) { - TFM_Util.playerMsg(player, "Please do not repeat messages."); + TFM_Util.playerMsg(p, "Please do not repeat messages."); event.setCancelled(true); return; } @@ -429,9 +429,9 @@ public class TFM_PlayerListener implements Listener // Check for muted if (playerdata.isMuted()) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { - player.sendMessage(ChatColor.RED + "You are muted, STFU!"); + p.sendMessage(ChatColor.RED + "You are muted, STFU!"); event.setCancelled(true); return; } @@ -448,7 +448,7 @@ public class TFM_PlayerListener implements Listener if (message.length() > 100) { message = message.substring(0, 100); - TFM_Util.playerMsg(player, "Message was shortened because it was too long to send."); + TFM_Util.playerMsg(p, "Message was shortened because it was too long to send."); } // Check for caps @@ -471,7 +471,7 @@ public class TFM_PlayerListener implements Listener // Check for adminchat if (playerdata.inAdminChat()) { - TFM_Util.adminChatMessage(player, message, false); + TFM_Util.adminChatMessage(p, message, false); event.setCancelled(true); return; } @@ -482,13 +482,13 @@ public class TFM_PlayerListener implements Listener // Set the tag if (playerdata.getTag() != null) { - player.setDisplayName((playerdata.getTag() + " " + player.getDisplayName().replaceAll(" ", ""))); + p.setDisplayName((playerdata.getTag() + " " + p.getDisplayName().replaceAll(" ", ""))); } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -496,15 +496,15 @@ public class TFM_PlayerListener implements Listener public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) { String command = event.getMessage(); - Player player = event.getPlayer(); + Player p = event.getPlayer(); - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.setLastCommand(command); if (playerdata.incrementAndGetMsgCount() > MSG_PER_HEARTBEAT) { - TFM_Util.bcastMsg(player.getName() + " was automatically kicked for spamming commands.", ChatColor.RED); - TFM_Util.autoEject(player, "Kicked for spamming commands."); + TFM_Util.bcastMsg(p.getName() + " was automatically kicked for spamming commands.", ChatColor.RED); + TFM_Util.autoEject(p, "Kicked for spamming commands."); playerdata.resetMsgCount(); @@ -516,7 +516,7 @@ public class TFM_PlayerListener implements Listener if (playerdata.allCommandsBlocked()) { - TFM_Util.playerMsg(player, "Your commands have been blocked by an admin.", ChatColor.RED); + TFM_Util.playerMsg(p, "Your commands have been blocked by an admin.", ChatColor.RED); event.setCancelled(true); return; } @@ -524,13 +524,13 @@ public class TFM_PlayerListener implements Listener // Block commands if player is muted if (playerdata.isMuted()) { - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { for (String test_command : BLOCKED_MUTED_CMDS) { if (Pattern.compile("^/" + test_command.toLowerCase() + " ").matcher(command).find()) { - player.sendMessage(ChatColor.RED + "That command is blocked while you are muted."); + p.sendMessage(ChatColor.RED + "That command is blocked while you are muted."); event.setCancelled(true); return; } @@ -544,7 +544,7 @@ public class TFM_PlayerListener implements Listener if (TotalFreedomMod.preprocessLogEnabled) { - TFM_Log.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), command), true); + TFM_Log.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", p.getName(), ChatColor.stripColor(p.getDisplayName()), command), true); } command = command.toLowerCase().trim(); @@ -556,13 +556,13 @@ public class TFM_PlayerListener implements Listener event.setCancelled(true); } - if (!TFM_SuperadminList.isUserSuperadmin(player)) + if (!TFM_SuperadminList.isUserSuperadmin(p)) { for (Player pl : Bukkit.getOnlinePlayers()) { if (TFM_SuperadminList.isUserSuperadmin(pl) && TFM_PlayerData.getPlayerData(pl).cmdspyEnabled()) { - TFM_Util.playerMsg(pl, player.getName() + ": " + command); + TFM_Util.playerMsg(pl, p.getName() + ": " + command); } } } @@ -587,12 +587,12 @@ public class TFM_PlayerListener implements Listener @EventHandler(priority = EventPriority.MONITOR) public void onPlayerKick(PlayerKickEvent event) { - Player player = event.getPlayer(); - if (TotalFreedomMod.fuckoffEnabledFor.containsKey(player)) + Player p = event.getPlayer(); + if (TotalFreedomMod.fuckoffEnabledFor.containsKey(p)) { - TotalFreedomMod.fuckoffEnabledFor.remove(player); + TotalFreedomMod.fuckoffEnabledFor.remove(p); } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.disarmMP44(); if (playerdata.isCaged()) { @@ -604,12 +604,12 @@ public class TFM_PlayerListener implements Listener @EventHandler(priority = EventPriority.MONITOR) public void onPlayerQuit(PlayerQuitEvent event) { - Player player = event.getPlayer(); - if (TotalFreedomMod.fuckoffEnabledFor.containsKey(player)) + Player p = event.getPlayer(); + if (TotalFreedomMod.fuckoffEnabledFor.containsKey(p)) { - TotalFreedomMod.fuckoffEnabledFor.remove(player); + TotalFreedomMod.fuckoffEnabledFor.remove(p); } - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.disarmMP44(); if (playerdata.isCaged()) { @@ -623,41 +623,41 @@ public class TFM_PlayerListener implements Listener { try { - final Player player = event.getPlayer(); - final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + final Player p = event.getPlayer(); + final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.setSuperadminIdVerified(null); - TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(player); + TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(p); - boolean superadmin_impostor = TFM_SuperadminList.isSuperadminImpostor(player); + boolean superadmin_impostor = TFM_SuperadminList.isSuperadminImpostor(p); - if (superadmin_impostor || TFM_SuperadminList.isUserSuperadmin(player)) + if (superadmin_impostor || TFM_SuperadminList.isUserSuperadmin(p)) { - TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_Util.getRank(player)); + TFM_Util.bcastMsg(ChatColor.AQUA + p.getName() + " is " + TFM_Util.getRank(p)); if (superadmin_impostor) { - player.getInventory().clear(); - player.setOp(false); - player.setGameMode(GameMode.SURVIVAL); - TFM_Util.bcastMsg("Warning: " + player.getName() + " has been flagged as an impostor!", ChatColor.RED); + p.getInventory().clear(); + p.setOp(false); + p.setGameMode(GameMode.SURVIVAL); + TFM_Util.bcastMsg("Warning: " + p.getName() + " has been flagged as an impostor!", ChatColor.RED); } else { - if (TFM_SuperadminList.verifyIdentity(player.getName(), player.getAddress().getAddress().getHostAddress())) + if (TFM_SuperadminList.verifyIdentity(p.getName(), p.getAddress().getAddress().getHostAddress())) { playerdata.setSuperadminIdVerified(Boolean.TRUE); - TFM_SuperadminList.updateLastLogin(player); + TFM_SuperadminList.updateLastLogin(p); } else { playerdata.setSuperadminIdVerified(Boolean.FALSE); - TFM_Util.bcastMsg("Warning: " + player.getName() + " is an admin, but is using a username not registered to one of their IPs.", ChatColor.RED); + TFM_Util.bcastMsg("Warning: " + p.getName() + " is an admin, but is using a username not registered to one of their IPs.", ChatColor.RED); } - player.setOp(true); + p.setOp(true); } } @@ -668,12 +668,12 @@ public class TFM_PlayerListener implements Listener @Override public void run() { - player.sendMessage(ChatColor.RED + "Server is currently closed to non-superadmins."); + p.sendMessage(ChatColor.RED + "Server is currently closed to non-superadmins."); } }.runTaskLater(TotalFreedomMod.plugin, 20L * 3L); } } - catch (Throwable e) + catch (Throwable ex) { } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java index 49b7a342..9e86c9d2 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java @@ -158,25 +158,25 @@ public class TFM_ServerListener implements Listener } @Override - public PermissionAttachment addAttachment(Plugin target_plugin, String name, boolean value) + public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) { return null; } @Override - public PermissionAttachment addAttachment(Plugin target_plugin) + public PermissionAttachment addAttachment(Plugin plugin) { return null; } @Override - public PermissionAttachment addAttachment(Plugin target_plugin, String name, boolean value, int ticks) + public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) { return null; } @Override - public PermissionAttachment addAttachment(Plugin target_plugin, int ticks) + public PermissionAttachment addAttachment(Plugin plugin, int ticks) { return null; } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_DisguiseCraftBridge.java b/src/me/StevenLawson/TotalFreedomMod/TFM_DisguiseCraftBridge.java index ace27c0f..f114985d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_DisguiseCraftBridge.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_DisguiseCraftBridge.java @@ -26,9 +26,9 @@ public class TFM_DisguiseCraftBridge return api.undisguisePlayer(player); } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return false; @@ -53,9 +53,9 @@ public class TFM_DisguiseCraftBridge } } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -66,7 +66,7 @@ public class TFM_DisguiseCraftBridge { pluginEnabled = Bukkit.getPluginManager().isPluginEnabled("DisguiseCraft"); } - catch (Exception e) + catch (Exception ex) { } return pluginEnabled; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java index 6402e326..ed3a987b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java @@ -27,9 +27,9 @@ public class TFM_Heartbeat extends BukkitRunnable { lastRan = System.currentTimeMillis(); - for (Player player: server.getOnlinePlayers()) + for (Player p : server.getOnlinePlayers()) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p); playerdata.resetMsgCount(); playerdata.resetBlockDestroyCount(); playerdata.resetBlockPlaceCount(); diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java index 16e5e6b2..04f3accd 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java @@ -48,8 +48,8 @@ public class TFM_Log TFM_Log.log(Level.SEVERE, message, raw); } - public static void severe(Throwable e) + public static void severe(Throwable ex) { - logger.log(Level.SEVERE, null, e); + logger.log(Level.SEVERE, null, ex); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java index 6befc941..460adbea 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java @@ -62,9 +62,9 @@ public class TFM_PlayerData this.player_name = player.getName(); } - public static TFM_PlayerData getPlayerData(Player player) + public static TFM_PlayerData getPlayerData(Player p) { - TFM_PlayerData playerdata = TFM_PlayerData.userinfo.get(player); + TFM_PlayerData playerdata = TFM_PlayerData.userinfo.get(p); if (playerdata == null) { @@ -74,7 +74,7 @@ public class TFM_PlayerData Entry pair = it.next(); TFM_PlayerData playerdata_test = pair.getValue(); - if (playerdata_test.player_name.equalsIgnoreCase(player.getName())) + if (playerdata_test.player_name.equalsIgnoreCase(p.getName())) { if (Bukkit.getOnlineMode()) { @@ -83,7 +83,7 @@ public class TFM_PlayerData } else { - if (playerdata_test.ip_address.equalsIgnoreCase(player.getAddress().getAddress().getHostAddress())) + if (playerdata_test.ip_address.equalsIgnoreCase(p.getAddress().getAddress().getHostAddress())) { playerdata = playerdata_test; break; @@ -95,8 +95,8 @@ public class TFM_PlayerData if (playerdata == null) { - playerdata = new TFM_PlayerData(player); - TFM_PlayerData.userinfo.put(player, playerdata); + playerdata = new TFM_PlayerData(p); + TFM_PlayerData.userinfo.put(p, playerdata); } return playerdata; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java index ec301630..26bd870f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java @@ -83,9 +83,9 @@ public class TFM_ProtectedArea implements Serializable oos.close(); fos.close(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -104,12 +104,12 @@ public class TFM_ProtectedArea implements Serializable fis.close(); } } - catch (Exception e) + catch (Exception ex) { File input_file = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.PROTECTED_AREA_FILE); input_file.delete(); - TFM_Log.severe(e); + TFM_Log.severe(ex); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java index bb244d90..94a40c3c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java @@ -130,9 +130,9 @@ public class TFM_ServerInterface final BanList banByIP = player_list.getIPBans(); final BanList banByName = player_list.getNameBans(); - final Player player = event.getPlayer(); + final Player p = event.getPlayer(); - final String player_name = player.getName(); + final String player_name = p.getName(); final String player_ip = event.getAddress().getHostAddress().trim().toLowerCase(); if (player_name.trim().length() <= 2) @@ -146,7 +146,7 @@ public class TFM_ServerInterface return; } - // not safe to use TFM_Util.isUserSuperadmin for player logging in because player.getAddress() will return a null until after player login. + // not safe to use TFM_Util.isUserSuperadmin for player logging in because p.getAddress() will return a null until after player login. boolean is_superadmin; if (server.getOnlineMode()) { @@ -304,7 +304,7 @@ public class TFM_ServerInterface if (TotalFreedomMod.lockdownEnabled) { - TFM_Util.playerMsg(player, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED); + TFM_Util.playerMsg(p, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED); } } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java index 0ec5ed62..33f321c6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java @@ -88,10 +88,10 @@ public class TFM_ServiceChecker } } - catch (Exception e) + catch (Exception ex) { TFM_Log.severe("Error updating mojang services from " + TotalFreedomMod.serviceCheckerURL); - TFM_Log.severe(e); + TFM_Log.severe(ex); } } }; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Superadmin.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Superadmin.java index c4ab61a6..ae3483cd 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Superadmin.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Superadmin.java @@ -52,9 +52,9 @@ public class TFM_Superadmin output.append("- Console Aliases: ").append(StringUtils.join(this.console_aliases, ", ")).append("\n"); output.append("- Is Activated: ").append(this.is_activated); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return output.toString(); diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java index 0fa73842..c86e646d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java @@ -70,9 +70,9 @@ public class TFM_SuperadminList updateIndexLists(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -153,9 +153,9 @@ public class TFM_SuperadminList config.save(new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE)); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -173,9 +173,9 @@ public class TFM_SuperadminList } } - public static TFM_Superadmin getAdminEntry(Player player) + public static TFM_Superadmin getAdminEntry(Player p) { - return getAdminEntry(player.getName().toLowerCase()); + return getAdminEntry(p.getName().toLowerCase()); } public static TFM_Superadmin getAdminEntryByIP(String ip) @@ -193,9 +193,9 @@ public class TFM_SuperadminList return null; } - public static void updateLastLogin(Player player) + public static void updateLastLogin(Player p) { - TFM_Superadmin admin_entry = getAdminEntry(player); + TFM_Superadmin admin_entry = getAdminEntry(p); if (admin_entry != null) { admin_entry.setLastLogin(new Date()); @@ -260,7 +260,7 @@ public class TFM_SuperadminList } } } - catch (Exception e) + catch (Exception ex) { return false; } @@ -309,9 +309,9 @@ public class TFM_SuperadminList } } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return false; @@ -324,11 +324,11 @@ public class TFM_SuperadminList return false; } - Player player = (Player) user; + Player p = (Player) user; - if (superadminNames.contains(player.getName().toLowerCase())) + if (superadminNames.contains(p.getName().toLowerCase())) { - return !isUserSuperadmin(player); + return !isUserSuperadmin(p); } return false; @@ -360,16 +360,16 @@ public class TFM_SuperadminList saveSuperadminList(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } - public static void addSuperadmin(Player player) + public static void addSuperadmin(Player p) { - String admin_name = player.getName().toLowerCase(); - List ips = Arrays.asList(player.getAddress().getAddress().getHostAddress()); + String admin_name = p.getName().toLowerCase(); + List ips = Arrays.asList(p.getAddress().getAddress().getHostAddress()); addSuperadmin(admin_name, ips); } @@ -393,15 +393,15 @@ public class TFM_SuperadminList saveSuperadminList(); } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } - public static void removeSuperadmin(Player player) + public static void removeSuperadmin(Player p) { - removeSuperadmin(player.getName()); + removeSuperadmin(p.getName()); } public static void cleanSuperadminList(boolean verbose) @@ -433,9 +433,9 @@ public class TFM_SuperadminList } saveSuperadminList(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java b/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java index 629acec0..916b6d59 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java @@ -56,9 +56,9 @@ public class TFM_TwitterHandler line = in.readLine(); in.close(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(ExceptionUtils.getFullStackTrace(e)); + TFM_Log.severe(ExceptionUtils.getFullStackTrace(ex)); } return line; } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java index c18b3dbb..ad102b32 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java @@ -40,16 +40,16 @@ public class TFM_UserList userlist.put(username, entry); } - for (Player player: plugin.getServer().getOnlinePlayers()) + for (Player p : plugin.getServer().getOnlinePlayers()) { - addUser(player); + addUser(p); } exportList(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe("Error loading Userlist, resetting list: " + e.getMessage()); + TFM_Log.severe("Error loading Userlist, resetting list: " + ex.getMessage()); purge(); } } @@ -67,9 +67,9 @@ public class TFM_UserList { new_userlist.save(new File(plugin.getDataFolder(), USERLIST_FILENAME)); } - catch (IOException e) + catch (IOException ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -82,9 +82,9 @@ public class TFM_UserList return instance; } - public void addUser(Player player) + public void addUser(Player p) { - addUser(player.getName(), player.getAddress().getAddress().getHostAddress()); + addUser(p.getName(), p.getAddress().getAddress().getHostAddress()); } public void addUser(String username, String ip_address) @@ -105,9 +105,9 @@ public class TFM_UserList } } - public TFM_UserListEntry getEntry(Player player) + public TFM_UserListEntry getEntry(Player p) { - return getEntry(player.getName()); + return getEntry(p.getName()); } public TFM_UserListEntry getEntry(String username) @@ -119,9 +119,9 @@ public class TFM_UserList { userlist.clear(); - for (Player player: plugin.getServer().getOnlinePlayers()) + for (Player p : plugin.getServer().getOnlinePlayers()) { - addUser(player); + addUser(p); } exportList(); diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index 8890d221..cb3c137e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -40,7 +40,7 @@ public class TFM_Util } } } - catch (Exception e) + catch (Exception ex) { } } @@ -55,9 +55,9 @@ public class TFM_Util { TFM_Log.info(message, true); - for (Player player: Bukkit.getOnlinePlayers()) + for (Player p : Bukkit.getOnlinePlayers()) { - player.sendMessage((color == null ? "" : color) + message); + p.sendMessage((color == null ? "" : color) + message); } } @@ -396,14 +396,14 @@ public class TFM_Util STRIKE_ONE, STRIKE_TWO, STRIKE_THREE; } - public static void autoEject(Player player, String kickMessage) + public static void autoEject(Player p, String kickMessage) { EjectMethod method = EjectMethod.STRIKE_ONE; String player_ip = null; try { - player_ip = player.getAddress().getAddress().getHostAddress(); + player_ip = p.getAddress().getAddress().getHostAddress(); Integer num_kicks = TFM_Util.eject_tracker.get(player_ip); if (num_kicks == null) @@ -428,15 +428,15 @@ public class TFM_Util method = EjectMethod.STRIKE_THREE; } } - catch (Exception e) + catch (Exception ex) { } - TFM_Log.info("autoEject -> name: " + player.getName() + " - player_ip: " + player_ip + " - method: " + method.toString()); + TFM_Log.info("autoEject -> name: " + p.getName() + " - player_ip: " + player_ip + " - method: " + method.toString()); - player.setOp(false); - player.setGameMode(GameMode.SURVIVAL); - player.getInventory().clear(); + p.setOp(false); + p.setGameMode(GameMode.SURVIVAL); + p.getInventory().clear(); switch (method) { @@ -446,11 +446,11 @@ public class TFM_Util c.add(Calendar.MINUTE, 1); Date expires = c.getTime(); - TFM_Util.bcastMsg(ChatColor.RED + player.getName() + " has been banned for 1 minute."); + TFM_Util.bcastMsg(ChatColor.RED + p.getName() + " has been banned for 1 minute."); TFM_ServerInterface.banIP(player_ip, kickMessage, "AutoEject", expires); - TFM_ServerInterface.banUsername(player.getName(), kickMessage, "AutoEject", expires); - player.kickPlayer(kickMessage); + TFM_ServerInterface.banUsername(p.getName(), kickMessage, "AutoEject", expires); + p.kickPlayer(kickMessage); break; } @@ -460,11 +460,11 @@ public class TFM_Util c.add(Calendar.MINUTE, 3); Date expires = c.getTime(); - TFM_Util.bcastMsg(ChatColor.RED + player.getName() + " has been banned for 3 minutes."); + TFM_Util.bcastMsg(ChatColor.RED + p.getName() + " has been banned for 3 minutes."); TFM_ServerInterface.banIP(player_ip, kickMessage, "AutoEject", expires); - TFM_ServerInterface.banUsername(player.getName(), kickMessage, "AutoEject", expires); - player.kickPlayer(kickMessage); + TFM_ServerInterface.banUsername(p.getName(), kickMessage, "AutoEject", expires); + p.kickPlayer(kickMessage); break; } @@ -477,11 +477,11 @@ public class TFM_Util TFM_ServerInterface.banIP(ip_address_parts[0] + "." + ip_address_parts[1] + ".*.*", kickMessage, "AutoEject", null); //p.setBanned(true); - TFM_ServerInterface.banUsername(player.getName(), kickMessage, "AutoEject", null); + TFM_ServerInterface.banUsername(p.getName(), kickMessage, "AutoEject", null); - TFM_Util.bcastMsg(ChatColor.RED + player.getName() + " has been banned permanently."); + TFM_Util.bcastMsg(ChatColor.RED + p.getName() + " has been banned permanently."); - player.kickPlayer(kickMessage); + p.kickPlayer(kickMessage); break; } @@ -653,9 +653,9 @@ public class TFM_Util public static String playerListToNames(Set players) { List player_names = new ArrayList(); - for (OfflinePlayer player: players) + for (OfflinePlayer p : players) { - player_names.add(player.getName()); + player_names.add(p.getName()); } return StringUtils.join(player_names, ", "); } @@ -676,9 +676,9 @@ public class TFM_Util ois.close(); fis.close(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -728,9 +728,9 @@ public class TFM_Util oos.close(); fos.close(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } @@ -741,7 +741,7 @@ public class TFM_Util { do_wipe_flatlands = TFM_Util.getSavedFlag("do_wipe_flatlands"); } - catch (Exception e) + catch (Exception ex) { } @@ -779,7 +779,7 @@ public class TFM_Util { return new SimpleDateFormat(DATE_STORAGE_FORMAT, Locale.ENGLISH).parse(date_str); } - catch (ParseException e) + catch (ParseException ex) { return new Date(0L); } @@ -893,11 +893,11 @@ public class TFM_Util String name = sender.getName() + " " + getPrefix(sender, senderIsConsole); TFM_Log.info("[ADMIN] " + name + ": " + message); - for (Player player: Bukkit.getOnlinePlayers()) + for (Player p : Bukkit.getOnlinePlayers()) { - if (TFM_SuperadminList.isUserSuperadmin(player)) + if (TFM_SuperadminList.isUserSuperadmin(p)) { - player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + name + ": " + ChatColor.AQUA + message); + p.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + name + ": " + ChatColor.AQUA + message); } } } @@ -952,10 +952,10 @@ public class TFM_Util field.setAccessible(true); return (T) field.get(from); } - catch (NoSuchFieldException e) + catch (NoSuchFieldException ex) { } - catch (IllegalAccessException e) + catch (IllegalAccessException ex) { } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_WorldEditBridge.java b/src/me/StevenLawson/TotalFreedomMod/TFM_WorldEditBridge.java index 12ad33fe..b52baef0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_WorldEditBridge.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_WorldEditBridge.java @@ -30,56 +30,56 @@ public class TFM_WorldEditBridge } } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } return this.worldEditPlugin; } - public BukkitPlayer getBukkitPlayer(Player player) + public BukkitPlayer getBukkitPlayer(Player p) { try { WorldEditPlugin wep = this.getWorldEditPlugin(); if (wep != null) { - return wep.wrapPlayer(player); + return wep.wrapPlayer(p); } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return null; } - public LocalSession getPlayerSession(Player player) + public LocalSession getPlayerSession(Player p) { try { WorldEditPlugin wep = this.getWorldEditPlugin(); if (wep != null) { - return wep.getSession(player); + return wep.getSession(p); } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } return null; } - public void undo(Player player, int count) + public void undo(Player p, int count) { try { - LocalSession session = getPlayerSession(player); + LocalSession session = getPlayerSession(p); if (session != null) { - BukkitPlayer bukkitPlayer = this.getBukkitPlayer(player); + BukkitPlayer bukkitPlayer = this.getBukkitPlayer(p); if (bukkitPlayer != null) { for (int i = 0; i < count; i++) @@ -89,25 +89,25 @@ public class TFM_WorldEditBridge } } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } - public void setLimit(Player player, int limit) + public void setLimit(Player p, int limit) { try { - LocalSession session = getPlayerSession(player); + LocalSession session = getPlayerSession(p); if (session != null) { session.setBlockChangeLimit(limit); } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index 02f7e415..946a0336 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -139,9 +139,9 @@ public class TotalFreedomMod extends JavaPlugin Metrics metrics = new Metrics(plugin); metrics.start(); } - catch (IOException e) + catch (IOException ex) { - TFM_Log.warning("Failed to submit metrics data: " + e.getMessage()); + TFM_Log.warning("Failed to submit metrics data: " + ex.getMessage()); } TFM_Log.info("Plugin Enabled - Version: " + TotalFreedomMod.pluginVersion + "." + TotalFreedomMod.buildNumber + " by Madgeek1450 and DarthSalamon"); @@ -198,9 +198,9 @@ public class TotalFreedomMod extends JavaPlugin dispatcher = (TFM_Command) classLoader.loadClass(String.format("%s.%s%s", COMMAND_PATH, COMMAND_PREFIX, cmd.getName().toLowerCase())).newInstance(); dispatcher.setup(this, sender, dispatcher.getClass()); } - catch (Throwable e) + catch (Throwable ex) { - TFM_Log.severe("Command not loaded: " + cmd.getName() + "\n" + ExceptionUtils.getStackTrace(e)); + TFM_Log.severe("Command not loaded: " + cmd.getName() + "\n" + ExceptionUtils.getStackTrace(ex)); sender.sendMessage(ChatColor.RED + "Command Error: Command not loaded: " + cmd.getName()); return true; } @@ -216,15 +216,15 @@ public class TotalFreedomMod extends JavaPlugin sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS); } } - catch (Throwable e) + catch (Throwable ex) { - TFM_Log.severe("Command Error: " + commandLabel + "\n" + ExceptionUtils.getStackTrace(e)); + TFM_Log.severe("Command Error: " + commandLabel + "\n" + ExceptionUtils.getStackTrace(ex)); } } - catch (Throwable e) + catch (Throwable ex) { - TFM_Log.severe("Command Error: " + commandLabel + "\n" + ExceptionUtils.getStackTrace(e)); + TFM_Log.severe("Command Error: " + commandLabel + "\n" + ExceptionUtils.getStackTrace(ex)); sender.sendMessage(ChatColor.RED + "Unknown Command Error."); } @@ -324,9 +324,9 @@ public class TotalFreedomMod extends JavaPlugin logsRegisterURL = config.getString("logs_register_url", logsRegisterURL); serviceCheckerURL = config.getString("service_checker_url", serviceCheckerURL); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe("Error loading main config: " + e.getMessage()); + TFM_Log.severe("Error loading main config: " + ex.getMessage()); } } @@ -337,9 +337,9 @@ public class TotalFreedomMod extends JavaPlugin TFM_SuperadminList.backupSavedList(); TFM_SuperadminList.loadSuperadminList(); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe("Error loading superadmin list: " + e.getMessage()); + TFM_Log.severe("Error loading superadmin list: " + ex.getMessage()); } } // @@ -371,9 +371,9 @@ public class TotalFreedomMod extends JavaPlugin } } } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe("Error loading permban list: " + e.getMessage()); + TFM_Log.severe("Error loading permban list: " + ex.getMessage()); } } @@ -403,9 +403,9 @@ public class TotalFreedomMod extends JavaPlugin TotalFreedomMod.buildNumber = props.getProperty("program.BUILDNUM"); TotalFreedomMod.buildDate = props.getProperty("program.BUILDDATE"); } - catch (Exception e) + catch (Exception ex) { - TFM_Log.severe(e); + TFM_Log.severe(ex); } } }