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

+ Added option per arena to allowed certain commands. (Editable in arenas file!)

Browse Source
This commit is contained in:
Steffion 2013-08-10 20:20:01 +02:00
parent 8c22316b78
commit ccccacb760
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nl/Steffion/BlockHunt/Arena.java
View File

@ -31,6 +31,7 @@ public class Arena implements ConfigurationSerializable {
public LocationSerializable seekersWarp; public LocationSerializable seekersWarp;
public List<String> seekersWinCommands; public List<String> seekersWinCommands;
public List<String> hidersWinCommands; public List<String> hidersWinCommands;
public List<String> allowedCommands;
public List<Player> playersInArena; public List<Player> playersInArena;
public ArenaState gameState; public ArenaState gameState;
@ -44,8 +45,9 @@ public class Arena implements ConfigurationSerializable {
ArrayList<ItemStack> disguiseBlocks, ArrayList<ItemStack> disguiseBlocks,
LocationSerializable lobbyWarp, LocationSerializable hidersWarp, LocationSerializable lobbyWarp, LocationSerializable hidersWarp,
LocationSerializable seekersWarp, List<String> seekersWinCommands, LocationSerializable seekersWarp, List<String> seekersWinCommands,
List<String> hidersWinCommands, List<Player> playersInArena, List<String> allowedCommands, List<String> hidersWinCommands,
ArenaState gameState, int timer, List<Player> seekers) { List<Player> playersInArena, ArenaState gameState, int timer,
List<Player> seekers) {
this.arenaName = arenaName; this.arenaName = arenaName;
this.pos1 = pos1; this.pos1 = pos1;
this.pos2 = pos2; this.pos2 = pos2;
@ -65,6 +67,7 @@ public class Arena implements ConfigurationSerializable {
this.seekersWarp = seekersWarp; this.seekersWarp = seekersWarp;
this.seekersWinCommands = seekersWinCommands; this.seekersWinCommands = seekersWinCommands;
this.hidersWinCommands = hidersWinCommands; this.hidersWinCommands = hidersWinCommands;
this.allowedCommands = allowedCommands;
} }
public enum ArenaType { public enum ArenaType {
@ -98,6 +101,7 @@ public class Arena implements ConfigurationSerializable {
map.put("seekersWarp", seekersWarp); map.put("seekersWarp", seekersWarp);
map.put("seekersWinCommans", seekersWinCommands); map.put("seekersWinCommans", seekersWinCommands);
map.put("hidersWinCommands", hidersWinCommands); map.put("hidersWinCommands", hidersWinCommands);
map.put("allowedCommands", allowedCommands);
return map; return map;
} }
@ -121,7 +125,8 @@ public class Arena implements ConfigurationSerializable {
(ArrayList<String>) M.g(map, "seekersWinCommands", (ArrayList<String>) M.g(map, "seekersWinCommands",
new ArrayList<String>()), (ArrayList<String>) M.g(map, new ArrayList<String>()), (ArrayList<String>) M.g(map,
"hidersWinCommands", new ArrayList<String>()), "hidersWinCommands", new ArrayList<String>()),
new ArrayList<Player>(), ArenaState.WAITING, 0, (ArrayList<String>) M.g(map, "allowedCommands",
new ArrayList<Player>()); new ArrayList<String>()), new ArrayList<Player>(),
ArenaState.WAITING, 0, new ArrayList<Player>());
} }
} }

6
src/nl/Steffion/BlockHunt/Commands/CMDcreate.java
View File

@ -36,8 +36,10 @@ public class CMDcreate extends DefaultCMD {
3, 1, 90, 20, 300, 3, 1, 90, 20, 300,
new ArrayList<ItemStack>(), null, null, new ArrayList<ItemStack>(), null, null,
null, new ArrayList<String>(), null, new ArrayList<String>(),
new ArrayList<String>(), null, null, 0, new ArrayList<String>(),
null); new ArrayList<String>(),
new ArrayList<Player>(), null, 0,
new ArrayList<Player>());
W.arenas.getFile().set(args[1], arena); W.arenas.getFile().set(args[1], arena);
W.arenas.save(); W.arenas.save();
W.arenas.load(); W.arenas.load();