Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex

Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java

@@ -435,4 +435,9 @@ public class AntiHack extends MiniPlugin
 		_enabled = b;
 		System.out.println("MAC Enabled: " + b);
 	}
+	
+	public boolean IsEnabled()
+	{
+		return _enabled;
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Fly.java

@@ -37,6 +37,9 @@ public class Fly extends MiniPlugin implements Detector
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void updateFlyhack(PlayerMoveEvent event)
 	{
+		if (!Host.IsEnabled())
+			return;
+		
 		Player player = event.getPlayer();
 
 		//100% Valid

Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Idle.java

@@ -32,6 +32,9 @@ public class Idle extends MiniPlugin implements Detector
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void updateFlyhack(PlayerMoveEvent event)
 	{
+		if (!Host.IsEnabled())
+			return;
+		
 		Player player = event.getPlayer();
 
 		_idleTime.put(player, System.currentTimeMillis());
@@ -40,6 +43,9 @@ public class Idle extends MiniPlugin implements Detector
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void updateFreeCam(UpdateEvent event)
 	{
+		if (!Host.IsEnabled())
+			return;
+		
 		if (event.getType() != UpdateType.FAST)
 			return;
 

Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Speed.java

@@ -33,6 +33,9 @@ public class Speed extends MiniPlugin implements Detector
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void updateSpeedhack(PlayerMoveEvent event)
 	{
+		if (!Host.IsEnabled())
+			return;
+		
 		Player player = event.getPlayer();
 
 		//100% Valid

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/IdleManager.java

@@ -40,9 +40,12 @@ public class IdleManager implements Listener
 		if (event.getType() != UpdateType.FAST)
 			return;
 		
-		if (Manager.GetGame() == null)
+		if (Manager.IsTournamentServer())
 			return;
 		
+		if (Manager.GetGame() == null)
+			return;
+
 		if (Manager.GetGame() != null && !Manager.GetGame().IdleKick)
 			return;
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java

@@ -97,6 +97,9 @@ public class MiscManager implements Listener
 	@EventHandler
 	public void HubClockUpdate(UpdateEvent event)
 	{
+		if (Manager.IsTournamentServer())
+			return;
+		
 		if (event.getType() != UpdateType.SLOW)
 			return;
 		
@@ -121,6 +124,9 @@ public class MiscManager implements Listener
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void HubClockInteract(PlayerInteractEvent event)
 	{
+		if (Manager.IsTournamentServer())
+			return;
+		
 		Player player = event.getPlayer();
 
 		if (player.getItemInHand() == null)