EpicKnarvik97/BlockHunt
EpicKnarvik97/BlockHunt
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Added more arena config stuff.

Browse Source
This commit is contained in:
Steffion 2013-08-05 23:58:40 +02:00
parent 8043eb4e6e
commit 58e3d9b514
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nl/Steffion/BlockHunt/Serializables/ArenaSerializable.java
View File

@ -22,12 +22,14 @@ public class ArenaSerializable extends Arena implements
int waitingTimeSeeker, int gameTime, int waitingTimeSeeker, int gameTime,
ArrayList<ItemStack> disguiseBlocks, ArrayList<ItemStack> disguiseBlocks,
LocationSerializable lobbyWarp, LocationSerializable hidersWarp, LocationSerializable lobbyWarp, LocationSerializable hidersWarp,
LocationSerializable seekersWarp, List<Player> playersInArena, LocationSerializable seekersWarp, List<String> seekersWinCommands,
List<String> hidersWinCommands, List<Player> playersInArena,
ArenaState gameState, int timer, List<Player> seekers) { ArenaState gameState, int timer, List<Player> seekers) {
super(arenaName, pos1, pos2, maxPlayers, minPlayers, super(arenaName, pos1, pos2, maxPlayers, minPlayers,
amountSeekersOnStart, timeInLobbyUntilStart, waitingTimeSeeker, amountSeekersOnStart, timeInLobbyUntilStart, waitingTimeSeeker,
gameTime, disguiseBlocks, lobbyWarp, hidersWarp, seekersWarp, gameTime, disguiseBlocks, lobbyWarp, hidersWarp, seekersWarp,
playersInArena, gameState, timer, seekers); seekersWinCommands, hidersWinCommands, playersInArena,
gameState, timer, seekers);
} }
@Override @Override
@ -46,6 +48,8 @@ public class ArenaSerializable extends Arena implements
map.put("lobbyWarp", lobbyWarp); map.put("lobbyWarp", lobbyWarp);
map.put("hidersWarp", hidersWarp); map.put("hidersWarp", hidersWarp);
map.put("seekersWarp", seekersWarp); map.put("seekersWarp", seekersWarp);
map.put("seekersWinCommans", seekersWinCommands);
map.put("hidersWinCommands", hidersWinCommands);
return map; return map;
} }
@ -66,6 +70,9 @@ public class ArenaSerializable extends Arena implements
(LocationSerializable) M.g(map, "lobbyWarp", loc), (LocationSerializable) M.g(map, "lobbyWarp", loc),
(LocationSerializable) M.g(map, "hidersWarp", loc), (LocationSerializable) M.g(map, "hidersWarp", loc),
(LocationSerializable) M.g(map, "seekersWarp", loc), (LocationSerializable) M.g(map, "seekersWarp", loc),
(ArrayList<String>) M.g(map, "seekersWinCommands",
new ArrayList<String>()), (ArrayList<String>) M.g(map,
"hidersWinCommands", new ArrayList<String>()),
new ArrayList<Player>(), ArenaState.WAITING, 0, new ArrayList<Player>(), ArenaState.WAITING, 0,
new ArrayList<Player>()); new ArrayList<Player>());
} }

2
src/nl/Steffion/BlockHunt/W.java
View File

@ -45,6 +45,8 @@ public class W {
public static HashMap<Player, Double> pHealth = new HashMap<Player, Double>(); public static HashMap<Player, Double> pHealth = new HashMap<Player, Double>();
public static HashMap<Player, Integer> pFood = new HashMap<Player, Integer>(); public static HashMap<Player, Integer> pFood = new HashMap<Player, Integer>();
public static HashMap<Player, Location> moveLoc = new HashMap<Player, Location>();
public static void newFiles() { public static void newFiles() {
ConfigM.setDefaults(); ConfigM.setDefaults();
for (String Filename : newFiles) { for (String Filename : newFiles) {