JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chiss 2013-11-16 21:10:23 +11:00
commit 2a9c11d700
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Plugins/Libraries/craftbukkit.jar
View File

Binary file not shown.

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

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

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

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

4
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
View File

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

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

@ -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.SHEEP) {_disguise = new DisguiseSheep(Player); icon = Material.WOOL;}
else if (_type == EntityType.PIG) {_disguise = new DisguisePig(Player); icon = Material.PORK;} else if (_type == EntityType.PIG) {_disguise = new DisguisePig(Player); icon = Material.PORK;}
Host.Manager.GetDisguise().disguise(_disguise);
_disguise.setSoundDisguise(new DisguiseCat(Player)); _disguise.setSoundDisguise(new DisguiseCat(Player));
Host.Manager.GetDisguise().disguise(_disguise);
((CraftEntity)Player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0)); ((CraftEntity)Player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0));

BIN
Website/LOCWebsite.suo
View File

Binary file not shown.