diff --git a/appinfo.properties b/appinfo.properties index 814c3892..ee824bfa 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Mon, 12 Aug 2013 21:30:50 -0400 +#Mon, 12 Aug 2013 22:00:24 -0400 program.VERSION=2.22 -program.BUILDNUM=426 -program.BUILDDATE=08/12/2013 09\:30 PM +program.BUILDNUM=428 +program.BUILDDATE=08/12/2013 10\:00 PM diff --git a/buildnumber.properties b/buildnumber.properties index 05f46540..78266cbf 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon Aug 12 21:30:50 EDT 2013 -build.number=427 +#Mon Aug 12 22:00:24 EDT 2013 +build.number=429 diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 399e3ce5..43df1c50 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -213,6 +213,12 @@ public class TFM_PlayerListener implements Listener } } + @EventHandler(priority = EventPriority.HIGHEST) + public void onPlayerTeleport(PlayerTeleportEvent event) + { + TFM_AdminWorld.getInstance().validateMovement(event); + } + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerMove(PlayerMoveEvent event) { diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java index e9b9a9f4..0b2d360d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java @@ -56,7 +56,7 @@ public class TFM_AdminWorld if (lastTP == null || lastTP.longValue() + TP_COOLDOWN_TIME <= currentTimeMillis) { teleportCooldown.put(player, currentTimeMillis); - TFM_Util.bcastMsg(player.getName() + " attempted to access the AdminWorld.", ChatColor.RED); + TFM_Log.info(player.getName() + " attempted to access the AdminWorld."); new BukkitRunnable() { @Override