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

Change MPS world zip (#219)

Browse Source 
* Change MPS map name
This commit is contained in:
Timothy Andis 2016-09-28 18:32:51 -07:00 committed by Shaun Bennett
parent b27e1ffbd1
commit 620e219b14
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
View File

@ -159,7 +159,7 @@ public class PersonalServerManager extends MiniPlugin
}
}
final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, "", true, "arcade.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers,
final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, "", true, "Lobby-MPS.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers,
true, false, false, games, "", "", "Player", true, event, false, true, false, true, true, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", "");
getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()

13
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/current/NewGameLobbyManager.java
View File

@ -12,7 +12,6 @@ import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.games.deathtag.DeathTag;
import nautilus.game.arcade.game.games.hideseek.HideSeek;
import nautilus.game.arcade.game.games.wither.WitherGame;
import nautilus.game.arcade.game.games.wither.kit.KitWitherMinion;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability;
import nautilus.game.arcade.kit.KitSorter;
@ -235,12 +234,6 @@ public class NewGameLobbyManager extends LobbyManager
.filter(kit -> kit.GetAvailability() != KitAvailability.Hide)
.collect(Collectors.toList());
if(game instanceof WitherGame)
{
KitWitherMinion minion = (KitWitherMinion) kitList.remove(1);
kitList.add(minion);
}
List<Location> locations = _multipleLocs.get("KIT");
if (locations == null || locations.size() <= 1)
@ -255,7 +248,7 @@ public class NewGameLobbyManager extends LobbyManager
{
int shift = 0;
if(!(game instanceof DeathTag))
if(!(game instanceof DeathTag) && !(game instanceof WitherGame))
{
Collections.sort(kitList, new KitSorter());
}
@ -354,11 +347,11 @@ public class NewGameLobbyManager extends LobbyManager
Location yawLoc = entLoc.clone();
float yaw = 270;
float yaw = 90;
if(yawLoc.getBlockX() < 0)
{
yaw = 90;
yaw = 270;
}
entLoc.setYaw(yaw);