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

latest

Browse source
This commit is contained in:
BetaSteward 2010-04-11 22:28:51 +00:00
parent efdceacaf6
commit a9a0075768
15 changed files with 257 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbility;
import mage.cards.Card;
import mage.cards.Cards;
@ -48,7 +49,6 @@ import mage.server.ChatManager;
import mage.server.util.ThreadExecutor;
import mage.game.events.Listener;
import mage.game.events.PlayerQueryEvent;
import mage.human.HumanPlayer;
import mage.players.Player;
import mage.util.Logging;
import mage.view.AbilityPickerView;
@ -94,7 +94,7 @@ public class GameController implements GameCallback {
break;
case INFO:
ChatManager.getInstance().broadcast(chatId, "", event.getMessage());
logger.fine(game.getId() + " " + event.getMessage());
logger.finest(game.getId() + " " + event.getMessage());
break;
}
}
@ -111,6 +111,9 @@ public class GameController implements GameCallback {
case PICK_TARGET:
target(event.getPlayerId(), event.getMessage(), event.getCards(), event.isRequired());
break;
case PICK_ABILITY:
target(event.getPlayerId(), event.getMessage(), event.getAbilities(), event.isRequired());
break;
case SELECT:
select(event.getPlayerId(), event.getMessage());
break;
@ -160,7 +163,7 @@ public class GameController implements GameCallback {
private boolean allJoined() {
for (Player player: game.getPlayers().values()) {
if (player instanceof HumanPlayer && gameSessions.get(player.getId()) == null) {
if (player.isHuman() && gameSessions.get(player.getId()) == null) {
return false;
}
}
@ -204,10 +207,6 @@ public class GameController implements GameCallback {
updateGame();
}
// public void timeout(UUID sessionId) {
// kill(sessionId);
// }
public void kill(UUID sessionId) {
if (sessionPlayerMap.containsKey(sessionId)) {
gameSessions.get(sessionPlayerMap.get(sessionId)).setKilled();
@ -277,7 +276,7 @@ public class GameController implements GameCallback {
gameSessions.get(playerId).ask(question, getGameView(playerId));
}
private void chooseAbility(UUID playerId, Collection<? extends ActivatedAbility> choices) {
private void chooseAbility(UUID playerId, Collection<? extends Ability> choices) {
informOthers(playerId);
gameSessions.get(playerId).chooseAbility(new AbilityPickerView(choices));
}
@ -289,7 +288,12 @@ public class GameController implements GameCallback {
private void target(UUID playerId, String question, Cards cards, boolean required) {
informOthers(playerId);
gameSessions.get(playerId).target(question, getCardView(cards), required, getGameView(playerId));
gameSessions.get(playerId).target(question, new CardsView(cards), required, getGameView(playerId));
}
private void target(UUID playerId, String question, Collection<? extends Ability> abilities, boolean required) {
informOthers(playerId);
gameSessions.get(playerId).target(question, new CardsView(abilities, game), required, getGameView(playerId));
}
private void select(UUID playerId, String message) {
@ -314,7 +318,7 @@ public class GameController implements GameCallback {
private void revealCards(String name, Cards cards) {
for (GameSession session: gameSessions.values()) {
session.revealCards(name, getCardView(cards));
session.revealCards(name, new CardsView(cards));
}
}
@ -336,16 +340,10 @@ public class GameController implements GameCallback {
private GameView getGameView(UUID playerId) {
GameView gameView = new GameView(game.getState());
gameView.setHand(getCardView(game.getPlayer(playerId).getHand()));
gameView.setHand(new CardsView(game.getPlayer(playerId).getHand()));
return gameView;
}
private CardsView getCardView(Cards cards) {
if (cards == null)
return null;
return new CardsView(cards.values());
}
@Override
public void gameResult(String result) {
endGame(result);