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

Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java

@@ -59,7 +59,7 @@ import mineplex.minecraft.game.core.condition.ConditionManager;
 
 public class HubManager extends MiniClientPlugin<HubClient>
 {
-	public String Mode = "Halloween";
+	public String Mode = "Normal";
 	
 	private BlockRestore _blockRestore;
 	private CoreClientManager _clientManager; 

Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java

@@ -44,7 +44,7 @@ public class Halloween2013_BatGun extends ItemGadget
 					C.cWhite + "Launch waves of annoying bats",
 					C.cWhite + "at people you don't like!",
 				}, 
-				7500,  
+				-1,  
 				Material.IRON_BARDING, (byte)0);
 	}
 

Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java

@@ -122,7 +122,7 @@ public class ServerMonitor
 	    try 
 	    {
 	    	process = new ProcessBuilder(new String[] {"/bin/sh", cmd, serverToKill.Address, serverToKill.Name}).start();
-	    	process.waitFor(); 
+	    	process.wait(1000); 
             BufferedReader reader=new BufferedReader(new InputStreamReader(process.getInputStream())); 
             String line = reader.readLine(); 
             
@@ -156,7 +156,7 @@ public class ServerMonitor
 	    try 
 	    {
 	    	process = new ProcessBuilder(new String[] {"/bin/sh", cmd, serverSpace.Address, serverGroup.ScriptName, serverGroup.Prefix + "-" + serverNum, "1", serverSpace.US ? "us" : "eu"}).start();
-	    	process.waitFor(); 
+	    	process.wait(3000); 
             BufferedReader reader=new BufferedReader(new InputStreamReader(process.getInputStream())); 
             String line = reader.readLine();
             

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java

@@ -40,8 +40,8 @@ public class CreatureForm extends Form
 		else if (_type == EntityType.SHEEP)			{_disguise = new DisguiseSheep(Player);		icon = Material.WOOL;}
 		else if (_type == EntityType.PIG)			{_disguise = new DisguisePig(Player);		icon = Material.PORK;}
 
-		Host.Manager.GetDisguise().disguise(_disguise);
 		_disguise.setSoundDisguise(new DisguiseCat(Player));
+		Host.Manager.GetDisguise().disguise(_disguise);
 
 		((CraftEntity)Player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0));