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

DINGO ATE MY BABY

Browse Source
This commit is contained in:
Mini-Chiss 2015-08-04 17:33:23 +02:00
parent ec3bc7cc38
commit 1fd5c51f03
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -294,6 +294,8 @@ public abstract class Game implements Listener
} }
if (Manager.GetGameCreationManager().MapPref != null) if (Manager.GetGameCreationManager().MapPref != null)
{ {
System.out.println("Map Preference: " + Manager.GetGameCreationManager().MapPref);
HashMap<GameType, ArrayList<String>> matches = new HashMap<GameType, ArrayList<String>>(); HashMap<GameType, ArrayList<String>> matches = new HashMap<GameType, ArrayList<String>>();
for (GameType game : _files.keySet()) for (GameType game : _files.keySet())
{ {
@ -302,7 +304,7 @@ public abstract class Game implements Listener
{ {
if (cur.toLowerCase().contains(Manager.GetGameCreationManager().MapPref.toLowerCase())) if (cur.toLowerCase().contains(Manager.GetGameCreationManager().MapPref.toLowerCase()))
{ {
if(game.toString().toLowerCase().contains(Manager.GetGameCreationManager().MapSource.toLowerCase())) if(game.GetName().toLowerCase().contains(Manager.GetGameCreationManager().MapSource.toLowerCase()))
{ {
list.add(cur); list.add(cur);
System.out.print("Map Preference: " + cur); System.out.print("Map Preference: " + cur);
@ -318,6 +320,10 @@ public abstract class Game implements Listener
Manager.GetGameCreationManager().MapPref = null; Manager.GetGameCreationManager().MapPref = null;
Manager.GetGameCreationManager().MapSource = null; Manager.GetGameCreationManager().MapSource = null;
} }
else
{
System.out.println("Map Preference: None");
}
WorldData = new WorldData(this); WorldData = new WorldData(this);
//Stat Trackers //Stat Trackers

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java
View File

@ -36,6 +36,7 @@ public class ChooseMapButton implements IButton
_arcadeManager.GetGameCreationManager().MapSource = _gameType.GetName(); _arcadeManager.GetGameCreationManager().MapSource = _gameType.GetName();
if(_gameType.getMapSource() != null) if(_gameType.getMapSource() != null)
_arcadeManager.GetGameCreationManager().MapSource = _gameType.getMapSource()[0].GetName(); _arcadeManager.GetGameCreationManager().MapSource = _gameType.getMapSource()[0].GetName();
_arcadeManager.GetGameCreationManager().MapPref = _map; _arcadeManager.GetGameCreationManager().MapPref = _map;
_arcadeManager.GetGame().setGame(_gameType, player, true); _arcadeManager.GetGame().setGame(_gameType, player, true);
player.closeInventory(); player.closeInventory();

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
View File

@ -167,6 +167,9 @@ public class GameCreationManager implements Listener
HashMap<String, ChatColor> pastTeams = null; HashMap<String, ChatColor> pastTeams = null;
System.out.println(_nextGame == null ? "Next Game = null" : "Next Game = " + _nextGame.GetName());
System.out.println(MapPref == null ? "Map Pref = null" : "Map Pref = " + MapPref);
//Chosen Game //Chosen Game
if (_nextGame != null) if (_nextGame != null)
{ {