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

Fix MPS zip file name, null amp stand

Browse Source
This commit is contained in:
Shaun Bennett 2016-09-29 09:10:25 -04:00
parent b3d8c72953
commit 9d6985ddcd
3 changed files with 19 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, "Lobby-MPS.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()

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java
View File

@ -18,6 +18,7 @@ import mineplex.core.common.util.UtilServer;
import mineplex.core.hologram.HologramManager;
import mineplex.core.npc.NpcManager;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.managers.lobby.LobbyManager;
import org.bukkit.Bukkit;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
@ -40,9 +41,10 @@ public class GameBoosterManager extends MiniPlugin
_boosterGroup = boosterGroup;
_boosterManager = boosterManager;
if (boosterGroup != null && boosterGroup.length() > 0)
LobbyManager lobbyManager = Managers.get(ArcadeManager.class).GetLobby();
if (boosterGroup != null && boosterGroup.length() > 0 && lobbyManager.getAmpStand() != null)
{
new BoosterPodium(plugin, this, hologramManager, npcManager, Managers.get(ArcadeManager.class).GetLobby().getAmpStand());
new BoosterPodium(plugin, this, hologramManager, npcManager, lobbyManager.getAmpStand());
}
}

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

@ -410,7 +410,7 @@ public class NewGameLobbyManager extends LobbyManager
locations.add(loc);
}
if(locations.size() == 1)
if (locations.size() == 1)
{
_singleLocs.put(lastName, locations.get(0));
} else
@ -425,16 +425,22 @@ public class NewGameLobbyManager extends LobbyManager
setSpawn(_singleLocs.get(DataLoc.SPAWN.name()));
Location carl = _singleLocs.get(DataLoc.CARL.name()).add(0, 0.5, 0);
float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(carl, getSpawn()));
carl.setYaw(yaw);
Location carl = _singleLocs.get(DataLoc.CARL.name());
if (carl != null)
{
carl.add(0, 0.5, 0);
float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(carl, getSpawn()));
carl.setYaw(yaw);
setCarl(carl);
setCarl(carl);
}
Location amp = _singleLocs.get(DataLoc.AMP.name());
amp.setYaw(UtilAlg.GetYaw(UtilAlg.getTrajectory(amp, getSpawn())));
setAmpStand(amp);
if (amp != null)
{
amp.setYaw(UtilAlg.GetYaw(UtilAlg.getTrajectory(amp, getSpawn())));
setAmpStand(amp);
}
}
protected Location StrToLoc(String loc)