diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar index fbb8fcb8d..b0a01f555 100644 Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index b97db96ac..acce3f174 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -59,7 +59,7 @@ import mineplex.minecraft.game.core.condition.ConditionManager; public class HubManager extends MiniClientPlugin { - public String Mode = "Halloween"; + public String Mode = "Normal"; private BlockRestore _blockRestore; private CoreClientManager _clientManager; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java index 5fffd95ec..bc23449c7 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java +++ b/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); } diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java index 0e10e4d1b..a2c489013 100644 --- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java +++ b/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(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java index ec831ae03..0a292a6ce 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java +++ b/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)); diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 25df00210..598e07b59 100644 Binary files a/Website/LOCWebsite.suo and b/Website/LOCWebsite.suo differ