Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Added option to select time limit (also none) on match or tournament creation.

Browse source
This commit is contained in:
LevelX2 2013-06-21 21:34:06 +02:00
parent a573d2c026
commit 738efcc47f
15 changed files with 367 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -137,7 +137,7 @@ public class GameController implements GameCallback {
throw new IllegalStateException("INIT_TIMER: playerId can't be null");
}
long delay = 250L; // run each 250 ms
timer = new PriorityTimer(Constants.PRIORITY_TIME_SEC, delay, new Action() {
timer = new PriorityTimer(game.getPriorityTime(), delay, new Action() {
@Override
public void execute() throws MageException {
game.concede(initPlayerId);
@ -433,10 +433,12 @@ public class GameController implements GameCallback {
}
private synchronized void updateGame() {
for (Player player: game.getState().getPlayers().values()) {
PriorityTimer timer = timers.get(player.getId());
if (timer != null) {
player.setPriorityTimeLeft(timer.getCount());
if (!timers.isEmpty()) {
for (Player player: game.getState().getPlayers().values()) {
PriorityTimer timer = timers.get(player.getId());
if (timer != null) {
player.setPriorityTimeLeft(timer.getCount());
}
}
}
for (final GameSession gameSession: gameSessions.values()) {