From 601c1912f5a4539710e4ac5f28f821752b441d4d Mon Sep 17 00:00:00 2001
From: Chiss <ChristopherJozsa@gmail.com>
Date: Sat, 8 Nov 2014 11:03:53 +1100
Subject: [PATCH 1/2] may have fixed sheep teams not working.

---
 .../src/nautilus/game/arcade/game/games/uhc/UHC.java        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
index dd9c9479a..a7612367b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
@@ -1255,6 +1255,12 @@ public class UHC extends TeamGame
 			Manager.GetPortal().SendPlayerToServer(player, "Lobby");	
 		}
 	}
+	
+	@Override
+	public boolean CanJoinTeam(GameTeam team)
+	{
+		return team.GetSize() < 2;
+	}
 
 	//Ensure 2 players per team
 	@Override

From fc2bba7eeb41772bf5e0cbe6a464c9d722b4da3a Mon Sep 17 00:00:00 2001
From: Chiss <ChristopherJozsa@gmail.com>
Date: Sat, 8 Nov 2014 11:08:13 +1100
Subject: [PATCH 2/2] reverted idlemanager stuff for dmt(had already made
 talking in chat count as action)

---
 .../game/arcade/game/games/draw/Draw.java        |  2 --
 .../game/arcade/managers/IdleManager.java        | 16 +---------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
index dff1c691f..da0eb3874 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
@@ -125,8 +125,6 @@ public class Draw extends SoloGame
 				new KeenEyeStatTracker(this),
 				new PureLuckStatTracker(this)
 		);
-
-		getArcadeManager().getIdleManager().setEnabled(false);
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/IdleManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/IdleManager.java
index fab814408..d0cf29d43 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/IdleManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/IdleManager.java
@@ -27,7 +27,6 @@ public class IdleManager implements Listener
 	private final Map<Player, Float> _yaw = new HashMap<>();
 	private final Map<Player, Long> _idle = new HashMap<>();
 	private final Map<Player, Integer> _beep = new HashMap<>();
-	private boolean _enabled = true;
 
 	public IdleManager(ArcadeManager manager)
 	{
@@ -39,7 +38,7 @@ public class IdleManager implements Listener
 	@EventHandler
 	public void ChatIdle(final AsyncPlayerChatEvent event)
 	{
-		if (!isEnabled())
+		if (!getArcadeManager().IsPlayerKickIdle())
 			return;
 		
 		Bukkit.getServer().getScheduler().runTaskLater(getArcadeManager().GetPlugin(), new Runnable()
@@ -55,9 +54,6 @@ public class IdleManager implements Listener
 	@EventHandler
 	public void kickIdlePlayers(UpdateEvent event)
 	{
-		if (!isEnabled())
-			return;
-
 		if (event.getType() != UpdateType.FAST)
 			return;
 		
@@ -133,16 +129,6 @@ public class IdleManager implements Listener
 		_beep.remove(event.getPlayer());
 	}
 
-	public boolean isEnabled()
-	{
-		return _enabled;
-	}
-
-	public void setEnabled(boolean enabled)
-	{
-		_enabled = enabled;
-	}
-
 	public ArcadeManager getArcadeManager()
 	{
 		return _arcadeManager;