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

If match timer is used, the AI consumes now also time for their priority action. Some minor changes to Gamemanager.

Browse source
This commit is contained in:
LevelX2 2014-09-03 09:49:44 +02:00
parent e8a72466d6
commit cb6cc62ed4
5 changed files with 98 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,7 @@ public class GameController implements GameCallback {
this.choosingPlayerId = choosingPlayerId;
for (Player player: game.getPlayers().values()) {
if (!player.isHuman()) {
useTimeout = false;
useTimeout = false; // no timeout because of beeing idle if playing against AI
break;
}
}
@ -421,14 +421,19 @@ public class GameController implements GameCallback {
}
public void kill(UUID userId) {
if (userPlayerMap.containsKey(userId)) {
gameSessions.get(userPlayerMap.get(userId)).setKilled();
gameSessions.remove(userPlayerMap.get(userId));
leave(userId);
userPlayerMap.remove(userId);
UUID playerId = userPlayerMap.get(userId);
if (playerId != null) {
GameSession gameSession = gameSessions.get(playerId);
if (gameSession != null) {
gameSession.setKilled();
gameSessions.remove(playerId);
leave(userId);
userPlayerMap.remove(userId);
}
}
if (watchers.containsKey(userId)) {
watchers.get(userId).setKilled();
GameWatcher gameWatcher = watchers.get(userId);
if (gameWatcher != null) {
gameWatcher.setKilled();
watchers.remove(userId);
}
}