diff --git a/buildnumber.properties b/buildnumber.properties index d2725b7..decd2f5 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sun Jun 22 18:05:43 CEST 2014 -build.number=876 +#Fri Jun 27 23:44:06 CEST 2014 +build.number=881 diff --git a/src/me/StevenLawson/TotalFreedomMod/Bridge/TFM_WorldEditBridge.java b/src/me/StevenLawson/TotalFreedomMod/Bridge/TFM_WorldEditBridge.java index 79eff0a..c27a0a4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Bridge/TFM_WorldEditBridge.java +++ b/src/me/StevenLawson/TotalFreedomMod/Bridge/TFM_WorldEditBridge.java @@ -130,26 +130,32 @@ public class TFM_WorldEditBridge try { final LocalSession session = getPlayerSession(player); - if (session != null) + + if (session == null) { - final World selectionWorld = session.getSelectionWorld(); - final Region selection = session.getSelection(selectionWorld); - if (TFM_ProtectedArea.isInProtectedArea( - getBukkitVector(selection.getMinimumPoint()), - getBukkitVector(selection.getMaximumPoint()), - selectionWorld.getName())) - { - new BukkitRunnable() - { - @Override - public void run() - { - player.sendMessage(ChatColor.RED + "The region that you selected contained a protected area. Selection cleared."); - session.getRegionSelector(selectionWorld).clear(); - } - }.runTaskLater(TotalFreedomMod.plugin, 1L); - } + return; } + + final World selectionWorld = session.getSelectionWorld(); + final Region selection = session.getSelection(selectionWorld); + + if (TFM_ProtectedArea.isInProtectedArea( + getBukkitVector(selection.getMinimumPoint()), + getBukkitVector(selection.getMaximumPoint()), + selectionWorld.getName())) + { + new BukkitRunnable() + { + @Override + public void run() + { + player.sendMessage(ChatColor.RED + "The region that you selected contained a protected area. Selection cleared."); + session.getRegionSelector(selectionWorld).clear(); + } + }.runTask(TotalFreedomMod.plugin); + } + + } catch (IncompleteRegionException ex) { diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java index dd9bfab..9d75a92 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java @@ -27,19 +27,12 @@ public class TFM_TelnetListener implements Listener if (admin == null || !admin.isTelnetAdmin()) { + event.setCancelled(true); return; } event.setBypassPassword(true); event.setName(admin.getLastLoginName()); - - final OfflinePlayer player = Bukkit.getOfflinePlayer(admin.getLastLoginName()); - if (player == null) - { - return; - } - - event.setName(player.getName()); } @EventHandler(priority = EventPriority.NORMAL) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java index 411f354..2df4709 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java @@ -246,13 +246,13 @@ public class TFM_AdminList config.set("clean_threshold_hours", cleanThreshold); - Iterator> it = adminList.entrySet().iterator(); + final Iterator> it = adminList.entrySet().iterator(); while (it.hasNext()) { - Entry pair = it.next(); + final Entry pair = it.next(); - UUID uuid = pair.getKey(); - TFM_Admin superadmin = pair.getValue(); + final UUID uuid = pair.getKey(); + final TFM_Admin superadmin = pair.getValue(); config.set("admins." + uuid + ".last_login_name", superadmin.getLastLoginName()); config.set("admins." + uuid + ".is_activated", superadmin.isActivated()); diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_BanManager.java b/src/me/StevenLawson/TotalFreedomMod/TFM_BanManager.java index 23a755a..4a8fa5c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_BanManager.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_BanManager.java @@ -271,11 +271,13 @@ public class TFM_BanManager public void purgeIpBans() { ipBans.clear(); + save(); } public void purgeUuidBans() { uuidBans.clear(); + save(); } public static TFM_BanManager getInstance()