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

~ Scoreboard now only shows while ingame. And won't flash on lag.

Browse Source
This commit is contained in:
Steffion 2013-08-17 20:08:03 +02:00
parent dcce1e2315
commit 4fdbdf6e65
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.configuration.serialization.SerializableAs; import org.bukkit.configuration.serialization.SerializableAs;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.scoreboard.Scoreboard;
@SerializableAs("BlockHuntArena") @SerializableAs("BlockHuntArena")
public class Arena implements ConfigurationSerializable { public class Arena implements ConfigurationSerializable {
@ -37,6 +38,7 @@ public class Arena implements ConfigurationSerializable {
public ArenaState gameState; public ArenaState gameState;
public int timer; public int timer;
public List<Player> seekers; public List<Player> seekers;
public Scoreboard scoreboard;
public Arena (String arenaName, LocationSerializable pos1, public Arena (String arenaName, LocationSerializable pos1,
LocationSerializable pos2, int maxPlayers, int minPlayers, LocationSerializable pos2, int maxPlayers, int minPlayers,
@ -47,7 +49,7 @@ public class Arena implements ConfigurationSerializable {
LocationSerializable seekersWarp, List<String> seekersWinCommands, LocationSerializable seekersWarp, List<String> seekersWinCommands,
List<String> hidersWinCommands, List<String> allowedCommands, List<String> hidersWinCommands, List<String> allowedCommands,
List<Player> playersInArena, ArenaState gameState, int timer, List<Player> playersInArena, ArenaState gameState, int timer,
List<Player> seekers) { List<Player> seekers, Scoreboard scoreboard) {
this.arenaName = arenaName; this.arenaName = arenaName;
this.pos1 = pos1; this.pos1 = pos1;
this.pos2 = pos2; this.pos2 = pos2;
@ -58,16 +60,18 @@ public class Arena implements ConfigurationSerializable {
this.waitingTimeSeeker = waitingTimeSeeker; this.waitingTimeSeeker = waitingTimeSeeker;
this.gameTime = gameTime; this.gameTime = gameTime;
this.disguiseBlocks = disguiseBlocks; this.disguiseBlocks = disguiseBlocks;
this.playersInArena = playersInArena;
this.gameState = gameState;
this.timer = timer;
this.seekers = seekers;
this.lobbyWarp = lobbyWarp; this.lobbyWarp = lobbyWarp;
this.hidersWarp = hidersWarp; this.hidersWarp = hidersWarp;
this.seekersWarp = seekersWarp; this.seekersWarp = seekersWarp;
this.seekersWinCommands = seekersWinCommands; this.seekersWinCommands = seekersWinCommands;
this.hidersWinCommands = hidersWinCommands; this.hidersWinCommands = hidersWinCommands;
this.allowedCommands = allowedCommands; this.allowedCommands = allowedCommands;
this.playersInArena = playersInArena;
this.gameState = gameState;
this.timer = timer;
this.seekers = seekers;
this.scoreboard = scoreboard;
} }
public enum ArenaType { public enum ArenaType {
@ -127,6 +131,7 @@ public class Arena implements ConfigurationSerializable {
"hidersWinCommands", new ArrayList<String>()), "hidersWinCommands", new ArrayList<String>()),
(ArrayList<String>) M.g(map, "allowedCommands", (ArrayList<String>) M.g(map, "allowedCommands",
new ArrayList<String>()), new ArrayList<Player>(), new ArrayList<String>()), new ArrayList<Player>(),
ArenaState.WAITING, 0, new ArrayList<Player>()); ArenaState.WAITING, 0, new ArrayList<Player>(), Bukkit
.getScoreboardManager().getNewScoreboard());
} }
} }