External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into Network_Upgrade

Browse source 
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
	Mage.Server/src/main/java/mage/server/User.java
	Mage.Server/src/main/java/mage/server/game/GameController.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
	Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
This commit is contained in:
betasteward 2015-07-12 12:25:44 -04:00
commit 5c829b79d5
552 changed files with 30213 additions and 6146 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Server/src/main/java/mage/server/ServerMain.java
View file

@ -1119,8 +1119,8 @@ public class ServerMain implements MageServer {
server.initGame(sessionId, gameId, gameView);
}
public void gameAsk(String sessionId, UUID gameId, GameView gameView, String question) {
server.gameAsk(sessionId, gameId, gameView, question);
public void gameAsk(String sessionId, UUID gameId, GameView gameView, String question, Map<String, Serializable> options) {
server.gameAsk(sessionId, gameId, gameView, question, options);
}
public void gameTarget(String sessionId, UUID gameId, GameView gameView, String question, CardsView cardView, Set<UUID> targets, boolean required, Map<String, Serializable> options) {
@ -1143,8 +1143,8 @@ public class ServerMain implements MageServer {
server.gameChooseChoice(sessionId, gameId, choice);
}
public void gamePlayMana(String sessionId, UUID gameId, GameView gameView, String message) {
server.gamePlayMana(sessionId, gameId, gameView, message);
public void gamePlayMana(String sessionId, UUID gameId, GameView gameView, String message, Map<String, Serializable> options) {
server.gamePlayMana(sessionId, gameId, gameView, message, options);
}
public void gamePlayXMana(String sessionId, UUID gameId, GameView gameView, String message) {

14
Mage.Server/src/main/java/mage/server/Session.java
View file

@ -154,7 +154,9 @@ public class Session {
if (user == null) {
user = UserManager.getInstance().findUser("Admin");
}
user.setUserData(new UserData(UserGroup.ADMIN, 0, false, false, false, null, "world.png", false));
UserData adminUserData = UserData.getDefaultUserDataView();
adminUserData.setGroupId(UserGroup.ADMIN.getGroupId());
user.setUserData(adminUserData);
if (!UserManager.getInstance().connectToSession(sessionId, user.getId())) {
logger.info("Error connecting Admin!");
}
@ -167,9 +169,10 @@ public class Session {
UserData userData = user.getUserData();
if (user.getUserData() == null || user.getUserData().getGroupId() == UserGroup.DEFAULT.getGroupId()) {
userData = new UserData(UserGroup.PLAYER, userDataView.getAvatarId(),
userDataView.isShowAbilityPickerForced(), userDataView.allowRequestShowHandCards(),
userDataView.isShowAbilityPickerForced(), userDataView.isAllowRequestShowHandCards(),
userDataView.confirmEmptyManaPool(), userDataView.getUserSkipPrioritySteps(),
userDataView.getFlagName(), userDataView.askMoveToGraveOrder());
userDataView.getFlagName(), userDataView.askMoveToGraveOrder(),
userDataView.isManaPoolAutomatic(), userDataView.isAllowRequestShowHandCards());
user.setUserData(userData);
} else {
if (userData.getAvatarId() == 51) { // Update special avatar if first avatar is selected
@ -177,7 +180,7 @@ public class Session {
}
userData.setAvatarId(userDataView.getAvatarId());
userData.setShowAbilityPickerForced(userDataView.isShowAbilityPickerForced());
userData.setAllowRequestShowHandCards(userDataView.allowRequestShowHandCards());
userData.setAllowRequestShowHandCards(userDataView.isAllowRequestShowHandCards());
userData.setUserSkipPrioritySteps(userDataView.getUserSkipPrioritySteps());
userData.setConfirmEmptyManaPool(userDataView.confirmEmptyManaPool());
userData.setAskMoveToGraveOrder(userDataView.askMoveToGraveOrder());
@ -212,6 +215,9 @@ public class Session {
default:
userData.setAvatarId(51);
break;
case "Wehk":
userData.setAvatarId(66);
break;
}
}

8
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -625,14 +625,10 @@ public class TableController {
// log about game started
logger.info("GAME started " + match.getGame().getId() + " [" + match.getName() + "] " + creator + " - " + opponent.toString());
logger.debug("- matchId: " + match.getId() + " [" + match.getName() + "]");
if (match.getGame() != null) {
logger.debug("- chatId: " + GameManager.getInstance().getChatId(match.getGame().getId()));
} else {
logger.debug("- no valid game object");
}
logger.debug("- chatId: " + GameManager.getInstance().getChatId(match.getGame().getId()));
LogServiceImpl.instance.log(LogKeys.KEY_GAME_STARTED, String.valueOf(userPlayerMap.size()), creator, opponent.toString());
} catch (Exception ex) {
logger.fatal("Error starting game", ex);
logger.fatal("Error starting game table: " + table.getId(), ex);
if (table != null) {
TableManager.getInstance().removeTable(table.getId());
}

11
Mage.Server/src/main/java/mage/server/User.java
View file

@ -44,7 +44,6 @@ import mage.constants.ManaType;
import mage.game.Table;
import mage.game.tournament.TournamentPlayer;
import mage.players.net.UserData;
import mage.players.net.UserGroup;
import mage.remote.DisconnectReason;
import mage.server.draft.DraftSession;
import mage.server.game.GameManager;
@ -213,8 +212,8 @@ public class User {
ServerMain.getInstance().initGame(sessionId, gameId, gameView);
}
public void gameAsk(UUID gameId, GameView gameView, String question) {
ServerMain.getInstance().gameAsk(sessionId, gameId, gameView, question);
public void gameAsk(UUID gameId, GameView gameView, String question, Map<String, Serializable> options) {
ServerMain.getInstance().gameAsk(sessionId, gameId, gameView, question, options);
}
public void gameTarget(UUID gameId, GameView gameView, String question, CardsView cardView, Set<UUID> targets, boolean required, Map<String, Serializable> options) {
@ -237,8 +236,8 @@ public class User {
ServerMain.getInstance().gameChooseChoice(sessionId, gameId, choice);
}
public void gamePlayMana(UUID gameId, GameView gameView, String message) {
ServerMain.getInstance().gamePlayMana(sessionId, gameId, gameView, message);
public void gamePlayMana(UUID gameId, GameView gameView, String message, Map<String, Serializable> options) {
ServerMain.getInstance().gamePlayMana(sessionId, gameId, gameView, message, options);
}
public void gamePlayXMana(UUID gameId, GameView gameView, String message) {
@ -518,7 +517,7 @@ public class User {
public UserData getUserData() {
if (userData == null) {// default these to avaiod NPE -> will be updated from client short after
return new UserData(UserGroup.DEFAULT, 0, false, false, false, null, "world.png", false);
return UserData.getDefaultUserDataView();
}
return this.userData;
}

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

@ -1,31 +1,30 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.server.game;
import java.io.BufferedOutputStream;
@ -110,7 +109,7 @@ public class GameController implements GameCallback {
private ConcurrentHashMap<UUID, GameSessionPlayer> gameSessions = new ConcurrentHashMap<>();
private ConcurrentHashMap<UUID, GameSessionWatcher> watchers = new ConcurrentHashMap<>();
private ConcurrentHashMap<UUID, PriorityTimer> timers = new ConcurrentHashMap<>();
private ConcurrentHashMap<UUID, UUID> userPlayerMap;
private UUID gameSessionId;
private Game game;
@ -120,11 +119,10 @@ public class GameController implements GameCallback {
private Future<?> gameFuture;
private boolean useTimeout = true;
private GameOptions gameOptions;
private UUID userReqestingRollback;
private int turnsToRollback;
private int requestsOpen;
public GameController(Game game, ConcurrentHashMap<UUID, UUID> userPlayerMap, UUID tableId, UUID choosingPlayerId, GameOptions gameOptions) {
gameSessionId = UUID.randomUUID();
@ -136,7 +134,7 @@ public class GameController implements GameCallback {
this.tableId = tableId;
this.choosingPlayerId = choosingPlayerId;
this.gameOptions = gameOptions;
for (Player player: game.getPlayers().values()) {
for (Player player : game.getPlayers().values()) {
if (!player.isHuman()) {
useTimeout = false; // no timeout for AI players because of beeing idle
break;
@ -148,11 +146,11 @@ public class GameController implements GameCallback {
public void cleanUp() {
cancelTimeout();
for (GameSessionPlayer gameSessionPlayer: gameSessions.values()) {
for (GameSessionPlayer gameSessionPlayer : gameSessions.values()) {
gameSessionPlayer.CleanUp();
}
ChatManager.getInstance().destroyChatSession(chatId);
for(PriorityTimer priorityTimer: timers.values()) {
for (PriorityTimer priorityTimer : timers.values()) {
priorityTimer.cancel();
}
}
@ -217,73 +215,73 @@ public class GameController implements GameCallback {
}
timer.pause();
break;
}
} catch (MageException ex) {
logger.fatal("Table event listener error ", ex);
}
} catch (MageException ex) {
logger.fatal("Table event listener error ", ex);
}
}
}
);
game.addPlayerQueryEventListener(
new Listener<PlayerQueryEvent> () {
@Override
public void event(PlayerQueryEvent event) {
logger.trace(new StringBuilder(event.getPlayerId().toString()).append("--").append(event.getQueryType()).append("--").append(event.getMessage()).toString());
try {
switch (event.getQueryType()) {
case ASK:
ask(event.getPlayerId(), event.getMessage());
break;
case PICK_TARGET:
target(event.getPlayerId(), event.getMessage(), event.getCards(), event.getPerms(), event.getTargets(), event.isRequired(), event.getOptions());
break;
case PICK_ABILITY:
target(event.getPlayerId(), event.getMessage(), event.getAbilities(), event.isRequired(), event.getOptions());
break;
case SELECT:
select(event.getPlayerId(), event.getMessage(), event.getOptions());
break;
case PLAY_MANA:
playMana(event.getPlayerId(), event.getMessage());
break;
case PLAY_X_MANA:
playXMana(event.getPlayerId(), event.getMessage());
break;
case CHOOSE_ABILITY:
String objectName = null;
if(event.getChoices() != null && event.getChoices().size() > 0) {
objectName = event.getChoices().iterator().next();
}
chooseAbility(event.getPlayerId(), objectName, event.getAbilities());
break;
case CHOOSE_PILE:
choosePile(event.getPlayerId(), event.getMessage(), event.getPile1(), event.getPile2());
break;
case CHOOSE_MODE:
chooseMode(event.getPlayerId(), event.getModes());
break;
case CHOOSE_CHOICE:
chooseChoice(event.getPlayerId(), event.getChoice());
break;
case AMOUNT:
amount(event.getPlayerId(), event.getMessage(), event.getMin(), event.getMax());
break;
case PERSONAL_MESSAGE:
informPersonal(event.getPlayerId(), event.getMessage());
break;
new Listener<PlayerQueryEvent>() {
@Override
public void event(PlayerQueryEvent event) {
logger.trace(new StringBuilder(event.getPlayerId().toString()).append("--").append(event.getQueryType()).append("--").append(event.getMessage()).toString());
try {
switch (event.getQueryType()) {
case ASK:
ask(event.getPlayerId(), event.getMessage(), event.getOptions());
break;
case PICK_TARGET:
target(event.getPlayerId(), event.getMessage(), event.getCards(), event.getPerms(), event.getTargets(), event.isRequired(), event.getOptions());
break;
case PICK_ABILITY:
target(event.getPlayerId(), event.getMessage(), event.getAbilities(), event.isRequired(), event.getOptions());
break;
case SELECT:
select(event.getPlayerId(), event.getMessage(), event.getOptions());
break;
case PLAY_MANA:
playMana(event.getPlayerId(), event.getMessage(), event.getOptions());
break;
case PLAY_X_MANA:
playXMana(event.getPlayerId(), event.getMessage());
break;
case CHOOSE_ABILITY:
String objectName = null;
if (event.getChoices() != null && event.getChoices().size() > 0) {
objectName = event.getChoices().iterator().next();
}
chooseAbility(event.getPlayerId(), objectName, event.getAbilities());
break;
case CHOOSE_PILE:
choosePile(event.getPlayerId(), event.getMessage(), event.getPile1(), event.getPile2());
break;
case CHOOSE_MODE:
chooseMode(event.getPlayerId(), event.getModes());
break;
case CHOOSE_CHOICE:
chooseChoice(event.getPlayerId(), event.getChoice());
break;
case AMOUNT:
amount(event.getPlayerId(), event.getMessage(), event.getMin(), event.getMax());
break;
case PERSONAL_MESSAGE:
informPersonal(event.getPlayerId(), event.getMessage());
break;
}
} catch (MageException ex) {
logger.fatal("Player event listener error ", ex);
}
} catch (MageException ex) {
logger.fatal("Player event listener error ", ex);
}
}
}
);
joinWaitingExecutor.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
try {
sendInfoAboutPlayersNotJoinedYet();
} catch(Exception ex) {
} catch (Exception ex) {
logger.fatal("Send info about player not joined yet:", ex);
}
}
@ -292,10 +290,12 @@ public class GameController implements GameCallback {
}
/**
* We create a timer that will run every 250 ms individually for a player decreasing his internal game counter.
* Later on this counter is used to get time left to play the whole match.
* We create a timer that will run every 250 ms individually for a player
* decreasing his internal game counter. Later on this counter is used to
* get time left to play the whole match.
*
* What we also do here is passing Action to PriorityTimer that is the action that will be executed once game timer is over.
* What we also do here is passing Action to PriorityTimer that is the
* action that will be executed once game timer is over.
*
* @param playerId
* @param count
@ -328,13 +328,13 @@ public class GameController implements GameCallback {
User user = UserManager.getInstance().getUser(userId);
if (userId == null || playerId == null) {
logger.fatal("Join game failed!");
logger.fatal("- gameId: " + game.getId());
logger.fatal("- userId: " + userId);
logger.fatal("- gameId: " + game.getId());
logger.fatal("- userId: " + userId);
return;
}
Player player = game.getPlayer(playerId);
if (player == null) {
logger.fatal("Player not found - playerId: " +playerId);
logger.fatal("Player not found - playerId: " + playerId);
return;
}
GameSessionPlayer gameSession = gameSessions.get(playerId);
@ -347,14 +347,14 @@ public class GameController implements GameCallback {
joinType = "rejoined";
}
user.addGame(playerId, gameSession);
logger.debug("Player " + player.getName()+ " " + playerId + " has " + joinType + " gameId: " + game.getId());
logger.debug("Player " + player.getName() + " " + playerId + " has " + joinType + " gameId: " + game.getId());
ChatManager.getInstance().inform(chatId, game.getPlayer(playerId).getName() + " has " + joinType + " the game", MessageColor.ORANGE, true, MessageType.GAME);
checkStart();
}
private synchronized void startGame() {
if (gameFuture == null) {
for (final Entry<UUID, GameSessionPlayer> entry: gameSessions.entrySet()) {
for (final Entry<UUID, GameSessionPlayer> entry : gameSessions.entrySet()) {
entry.getValue().init();
}
GameWorker worker = new GameWorker(game, choosingPlayerId, this);
@ -363,29 +363,29 @@ public class GameController implements GameCallback {
}
private void sendInfoAboutPlayersNotJoinedYet() {
for (Player player: game.getPlayers().values()) {
if (!player.hasLeft() && player.isHuman()) {
User user = getUserByPlayerId(player.getId());
for (Player player : game.getPlayers().values()) {
if (!player.hasLeft() && player.isHuman()) {
User user = getUserByPlayerId(player.getId());
if (user != null) {
if (!user.isConnected()) {
if (gameSessions.get(player.getId()) == null) {
// join the game because player has not joined are was removed because of disconnect
user.removeConstructing(player.getId());
GameManager.getInstance().joinGame(game.getId(), user.getId());
logger.debug("Player " + player.getLogName() + " (disconnected) has joined gameId: " +game.getId());
// join the game because player has not joined are was removed because of disconnect
user.removeConstructing(player.getId());
GameManager.getInstance().joinGame(game.getId(), user.getId());
logger.debug("Player " + player.getName() + " (disconnected) has joined gameId: " + game.getId());
}
Session session = SessionManager.getInstance().getSession(user.getSessionId());
ChatManager.getInstance().broadcast(chatId, user, session.getPingInfo() + " is pending to join the game", MessageColor.BLUE, true, ChatMessage.MessageType.STATUS);
if (user.getSecondsDisconnected() > 240) {
// Cancel player join possibility lately after 4 minutes
logger.debug("Player " + player.getLogName() + " - canceled game (after 240 seconds) gameId: " +game.getId());
logger.debug("Player " + player.getName() + " - canceled game (after 240 seconds) gameId: " + game.getId());
player.leave();
}
}
} else {
if (!player.hasLeft()) {
logger.debug("Player " + player.getLogName() + " canceled game (no user) gameId: " + game.getId());
logger.debug("Player " + player.getName() + " canceled game (no user) gameId: " + game.getId());
player.leave();
}
}
@ -395,7 +395,7 @@ public class GameController implements GameCallback {
}
private User getUserByPlayerId(UUID playerId) {
for(Map.Entry<UUID,UUID> entry: userPlayerMap.entrySet()) {
for (Map.Entry<UUID, UUID> entry : userPlayerMap.entrySet()) {
if (entry.getValue().equals(playerId)) {
return UserManager.getInstance().getUser(entry.getKey());
}
@ -407,17 +407,17 @@ public class GameController implements GameCallback {
if (allJoined()) {
joinWaitingExecutor.shutdownNow();
ThreadExecutor.getInstance().getCallExecutor().execute(
new Runnable() {
@Override
public void run() {
startGame();
}
});
new Runnable() {
@Override
public void run() {
startGame();
}
});
}
}
private boolean allJoined() {
for (Player player: game.getPlayers().values()) {
for (Player player : game.getPlayers().values()) {
if (!player.hasLeft()) {
User user = getUserByPlayerId(player.getId());
if (user != null) {
@ -484,60 +484,60 @@ public class GameController implements GameCallback {
}
public void sendPlayerAction(PlayerAction playerAction, UUID userId, Object data) {
switch(playerAction) {
switch (playerAction) {
case UNDO:
game.undo(getPlayerId(userId));
break;
case ROLLBACK_TURNS: // basic request of a player to rollback
case ROLLBACK_TURNS: // basic request of a player to rollback
if (data instanceof Integer) {
turnsToRollback = (Integer) data;
if (game.canRollbackTurns(turnsToRollback)) {
if (game.canRollbackTurns(turnsToRollback)) {
requestsOpen = requestPermissionToRollback(userId, turnsToRollback);
if (requestsOpen == 0) {
game.rollbackTurns(turnsToRollback);
turnsToRollback = -1;
requestsOpen = -1;
requestsOpen = -1;
} else {
userReqestingRollback = userId;
}
}
} else {
UUID playerId = getPlayerId(userId);
if (playerId != null) {
Player player = game.getPlayer(playerId);
if (player != null) {
if (player != null) {
game.informPlayer(player, "That turn is not available for rollback.");
}
}
}
}
}
break;
case ADD_PERMISSION_TO_ROLLBACK_TURN:
case ADD_PERMISSION_TO_ROLLBACK_TURN:
if (userReqestingRollback != null && requestsOpen > 0 && !userId.equals(userReqestingRollback)) {
requestsOpen--;
if (requestsOpen == 0) {
game.rollbackTurns(turnsToRollback);
turnsToRollback = -1;
turnsToRollback = -1;
userReqestingRollback = null;
requestsOpen = -1;
}
}
break;
case DENY_PERMISSON_TO_ROLLBACK_TURN: // one player has denied - so cancel the request
{
UUID playerId = getPlayerId(userId);
if (playerId != null) {
Player player = game.getPlayer(playerId);
if (player != null) {
if (userReqestingRollback != null && requestsOpen > 0 && !userId.equals(userReqestingRollback)) {
turnsToRollback = -1;
userReqestingRollback = null;
requestsOpen = -1;
game.informPlayers("Rollback request denied by " + player.getLogName());
}
{
UUID playerId = getPlayerId(userId);
if (playerId != null) {
Player player = game.getPlayer(playerId);
if (player != null) {
if (userReqestingRollback != null && requestsOpen > 0 && !userId.equals(userReqestingRollback)) {
turnsToRollback = -1;
userReqestingRollback = null;
requestsOpen = -1;
game.informPlayers("Rollback request denied by " + player.getLogName());
}
}
}
break;
}
break;
case CONCEDE:
game.concede(getPlayerId(userId));
break;
@ -578,28 +578,28 @@ public class GameController implements GameCallback {
requestPermissionToSeeHandCards(userId, (UUID) data);
}
break;
default:
default:
game.sendPlayerAction(playerAction, getPlayerId(userId));
}
}
private int requestPermissionToRollback(UUID userIdRequester, int numberTurns) {
int requests = 0;
for (Player player: game.getState().getPlayers().values()) {
for (Player player : game.getState().getPlayers().values()) {
User requestedUser = getUserByPlayerId(player.getId());
if (player.isInGame() && player.isHuman() &&
requestedUser != null &&
!requestedUser.getId().equals(userIdRequester)) {
if (player.isInGame() && player.isHuman()
&& requestedUser != null
&& !requestedUser.getId().equals(userIdRequester)) {
requests++;
GameSessionPlayer gameSession = gameSessions.get(player.getId());
if (gameSession != null) {
if (gameSession != null) {
gameSession.requestPermissionToRollbackTurn(userIdRequester, numberTurns);
}
}
}
return requests;
}
private void requestPermissionToSeeHandCards(UUID userIdRequester, UUID userIdGranter) {
Player grantingPlayer = game.getPlayer(userIdGranter);
if (grantingPlayer != null) {
@ -641,7 +641,7 @@ public class GameController implements GameCallback {
try {
deck = Deck.load(deckList, false, false);
game.loadCards(deck.getCards(), playerId);
for (Card card: deck.getCards()) {
for (Card card : deck.getCards()) {
card.putOntoBattlefield(game, Zone.OUTSIDE, null, playerId);
}
} catch (GameException ex) {
@ -668,20 +668,20 @@ public class GameController implements GameCallback {
public void idleTimeout(UUID playerId) {
Player player = game.getPlayer(playerId);
if (player != null) {
String sb = player.getLogName() +
" has timed out (player had priority and was not active for " +
ConfigSettings.getInstance().getMaxSecondsIdle() + " seconds ) - Auto concede.";
String sb = player.getLogName()
+ " has timed out (player had priority and was not active for "
+ ConfigSettings.getInstance().getMaxSecondsIdle() + " seconds ) - Auto concede.";
ChatManager.getInstance().inform(chatId, sb, MessageColor.BLACK, true, MessageType.STATUS);
game.idleTimeout(playerId);
}
}
public void endGame(final String message) throws MageException {
for (final GameSessionPlayer gameSession: gameSessions.values()) {
for (final GameSessionPlayer gameSession : gameSessions.values()) {
gameSession.gameOver(message);
gameSession.removeGame();
}
for (final GameSessionWatcher gameWatcher: watchers.values()) {
for (final GameSessionWatcher gameWatcher : watchers.values()) {
gameWatcher.gameOver(message);
}
TableManager.getInstance().endGame(tableId);
@ -698,7 +698,7 @@ public class GameController implements GameCallback {
public void sendPlayerUUID(UUID userId, final UUID data) {
sendMessage(userId, new Command() {
@Override
public void execute(UUID playerId) {
public void execute(UUID playerId) {
getGameSession(playerId).sendPlayerUUID(data);
}
});
@ -744,17 +744,17 @@ public class GameController implements GameCallback {
private synchronized void updateGame() {
if (!timers.isEmpty()) {
for (Player player: game.getState().getPlayers().values()) {
for (Player player : game.getState().getPlayers().values()) {
PriorityTimer timer = timers.get(player.getId());
if (timer != null) {
player.setPriorityTimeLeft(timer.getCount());
}
}
}
for (final GameSessionPlayer gameSession: gameSessions.values()) {
for (final GameSessionPlayer gameSession : gameSessions.values()) {
gameSession.update();
}
for (final GameSessionWatcher gameWatcher: watchers.values()) {
for (final GameSessionWatcher gameWatcher : watchers.values()) {
gameWatcher.update();
}
}
@ -763,7 +763,7 @@ public class GameController implements GameCallback {
Table table = TableManager.getInstance().getTable(tableId);
if (table != null) {
if (table.getMatch() != null) {
for (final GameSessionPlayer gameSession: gameSessions.values()) {
for (final GameSessionPlayer gameSession : gameSessions.values()) {
gameSession.endGameInfo(table);
}
}
@ -771,11 +771,11 @@ public class GameController implements GameCallback {
// TODO: inform watchers about game end and who won
}
private synchronized void ask(UUID playerId, final String question) throws MageException {
private synchronized void ask(UUID playerId, final String question, final Map<String, Serializable> options) throws MageException {
perform(playerId, new Command() {
@Override
public void execute(UUID playerId) {
getGameSession(playerId).ask(question);
public void execute(UUID playerId) {
getGameSession(playerId).ask(question, options);
}
});
@ -825,7 +825,7 @@ public class GameController implements GameCallback {
getGameSession(playerId).target(question, new CardsView(game, cards.getCards(game)), targets, required, options);
} else if (perms != null) {
CardsView permsView = new CardsView();
for (Permanent perm: perms) {
for (Permanent perm : perms) {
permsView.put(perm.getId(), new PermanentView(perm, game.getCard(perm.getId()), playerId, game));
}
getGameSession(playerId).target(question, permsView, targets, required, options);
@ -855,11 +855,11 @@ public class GameController implements GameCallback {
});
}
private synchronized void playMana(UUID playerId, final String message) throws MageException {
private synchronized void playMana(UUID playerId, final String message, final Map<String, Serializable> options) throws MageException {
perform(playerId, new Command() {
@Override
public void execute(UUID playerId) {
getGameSession(playerId).playMana(message);
getGameSession(playerId).playMana(message, options);
}
});
}
@ -869,7 +869,7 @@ public class GameController implements GameCallback {
@Override
public void execute(UUID playerId) {
getGameSession(playerId).playXMana(message);
}
}
});
}
@ -888,12 +888,12 @@ public class GameController implements GameCallback {
message.append(game.getStep().getType().toString()).append(" - ");
}
message.append("Waiting for ").append(game.getPlayer(playerId).getLogName());
for (final Entry<UUID, GameSessionPlayer> entry: gameSessions.entrySet()) {
for (final Entry<UUID, GameSessionPlayer> entry : gameSessions.entrySet()) {
if (!entry.getKey().equals(playerId)) {
entry.getValue().inform(message.toString());
}
}
for (final GameSessionWatcher watcher: watchers.values()) {
for (final GameSessionWatcher watcher : watchers.values()) {
watcher.inform(message.toString());
}
}
@ -908,7 +908,7 @@ public class GameController implements GameCallback {
return;
}
final String message = new StringBuilder(game.getStep().getType().toString()).append(" - Waiting for ").append(controller.getName()).toString();
for (final Entry<UUID, GameSessionPlayer> entry: gameSessions.entrySet()) {
for (final Entry<UUID, GameSessionPlayer> entry : gameSessions.entrySet()) {
boolean skip = false;
for (UUID uuid : players) {
if (entry.getKey().equals(uuid)) {
@ -920,7 +920,7 @@ public class GameController implements GameCallback {
entry.getValue().inform(message);
}
}
for (final GameSessionWatcher watcher: watchers.values()) {
for (final GameSessionWatcher watcher : watchers.values()) {
watcher.inform(message);
}
}
@ -939,10 +939,10 @@ public class GameController implements GameCallback {
sb.append(message).append(ex.toString());
sb.append("\nServer version: ").append(ServerMain.getVersion().toString());
sb.append("\n");
for (StackTraceElement e: ex.getStackTrace()) {
for (StackTraceElement e : ex.getStackTrace()) {
sb.append(e.toString()).append("\n");
}
for (final Entry<UUID, GameSessionPlayer> entry: gameSessions.entrySet()) {
for (final Entry<UUID, GameSessionPlayer> entry : gameSessions.entrySet()) {
entry.getValue().gameError(sb.toString());
}
}
@ -968,14 +968,12 @@ public class GameController implements GameCallback {
try {
output.writeObject(game);
output.writeObject(game.getGameStates());
}
finally {
} finally {
output.close();
}
logger.debug("Saved game:" + game.getId());
return true;
}
catch(IOException ex) {
} catch (IOException ex) {
logger.fatal("Cannot save game.", ex);
}
return false;
@ -990,6 +988,7 @@ public class GameController implements GameCallback {
/**
* Performas a request to a player
*
* @param playerId
* @param command
* @throws MageException
@ -1023,6 +1022,7 @@ public class GameController implements GameCallback {
/**
* A player has send an answer / request
*
* @param userId
* @param command
*/
@ -1031,24 +1031,24 @@ public class GameController implements GameCallback {
// player has game under control (is not cotrolled by other player)
Player player = game.getPlayer(playerId);
if (player != null && player.isGameUnderControl()) {
// if it's your priority (or game not started yet in which case it will be null)
// then execute only your action
if (game.getPriorityPlayerId() == null || game.getPriorityPlayerId().equals(playerId)) {
if (gameSessions.containsKey(playerId)) {
cancelTimeout();
command.execute(playerId);
}
} else {
// otherwise execute the action under other player's control
for (UUID controlled : player.getPlayersUnderYourControl()) {
if (gameSessions.containsKey(controlled) && game.getPriorityPlayerId().equals(controlled)) {
cancelTimeout();
command.execute(controlled);
}
}
// else player has no priority to do something, so ignore the command
// e.g. you click at one of your cards, but you can't play something at that moment
// if it's your priority (or game not started yet in which case it will be null)
// then execute only your action
if (game.getPriorityPlayerId() == null || game.getPriorityPlayerId().equals(playerId)) {
if (gameSessions.containsKey(playerId)) {
cancelTimeout();
command.execute(playerId);
}
} else {
// otherwise execute the action under other player's control
for (UUID controlled : player.getPlayersUnderYourControl()) {
if (gameSessions.containsKey(controlled) && game.getPriorityPlayerId().equals(controlled)) {
cancelTimeout();
command.execute(controlled);
}
}
// else player has no priority to do something, so ignore the command
// e.g. you click at one of your cards, but you can't play something at that moment
}
} else {
// ignore - no control over the turn
@ -1078,6 +1078,7 @@ public class GameController implements GameCallback {
}
interface Command {
void execute(UUID player);
}
@ -1095,10 +1096,10 @@ public class GameController implements GameCallback {
public String getPlayerNameList() {
StringBuilder sb = new StringBuilder(" [");
for (UUID playerId: userPlayerMap.values()) {
for (UUID playerId : userPlayerMap.values()) {
Player player = game.getPlayer(playerId);
if (player != null) {
sb.append(player.getName()).append("(Left=").append(player.hasLeft() ? "Y":"N").append(") ");
sb.append(player.getName()).append("(Left=").append(player.hasLeft() ? "Y" : "N").append(") ");
} else {
sb.append("player missing: ").append(playerId).append(" ");
}

130
Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
View file

@ -1,31 +1,30 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.server.game;
import java.io.Serializable;
@ -43,15 +42,12 @@ import mage.constants.ManaType;
import mage.constants.PlayerAction;
import mage.game.Game;
import mage.game.Table;
import mage.interfaces.callback.ClientCallback;
import mage.players.Player;
import mage.players.net.UserData;
import mage.server.User;
import mage.server.UserManager;
import mage.server.util.ThreadExecutor;
import mage.view.AbilityPickerView;
import mage.view.CardsView;
import mage.view.GameClientMessage;
import mage.view.GameView;
import mage.view.LookedAtView;
import mage.view.SimpleCardsView;
@ -80,12 +76,12 @@ public class GameSessionPlayer extends GameSessionWatcher {
super.CleanUp();
}
public void ask(final String question) {
public void ask(final String question, final Map<String, Serializable> options) {
if (!killed) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
// user.fireCallback(new ClientCallback("gameAsk", game.getId(), new GameClientMessage(getGameView(), question)));
user.gameAsk(game.getId(), getGameView(), question);
user.gameAsk(game.getId(), getGameView(), question, options);
}
}
}
@ -140,12 +136,12 @@ public class GameSessionPlayer extends GameSessionWatcher {
}
}
public void playMana(final String message) {
public void playMana(final String message, final Map<String, Serializable> options) {
if (!killed) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
// user.fireCallback(new ClientCallback("gamePlayMana", game.getId(), new GameClientMessage(getGameView(), message)));
user.gamePlayMana(game.getId(), getGameView(), message);
user.gamePlayMana(game.getId(), getGameView(), message, options);
}
}
}
@ -186,19 +182,18 @@ public class GameSessionPlayer extends GameSessionWatcher {
User requestedUser = UserManager.getInstance().getUser(userId);
if (requestedUser != null && requestingUser != null) {
String message;
switch(numberTurns) {
case 0:
switch (numberTurns) {
case 0:
message = "Allow rollback to the start of the current turn?";
break;
case 1:
message = "Allow rollback to the start of the previous turn?";
break;
default:
message = "Allow to rollback "+numberTurns+ " turns?";
message = "Allow to rollback " + numberTurns + " turns?";
}
UserRequestMessage userRequestMessage = new UserRequestMessage(
"Request by " + requestedUser.getName(), message
, PlayerAction.REQUEST_PERMISSION_TO_ROLLBACK_TURN);
"Request by " + requestedUser.getName(), message, PlayerAction.REQUEST_PERMISSION_TO_ROLLBACK_TURN);
userRequestMessage.setRelatedUser(requestingUserId, requestingUser.getName());
userRequestMessage.setGameId(game.getId());
userRequestMessage.setButton1("Accept", PlayerAction.ADD_PERMISSION_TO_ROLLBACK_TURN);
@ -208,7 +203,7 @@ public class GameSessionPlayer extends GameSessionWatcher {
}
}
}
public void requestPermissionToSeeHandCards(UUID watcherId) {
if (!killed) {
User watcher = UserManager.getInstance().getUser(watcherId);
@ -216,9 +211,8 @@ public class GameSessionPlayer extends GameSessionWatcher {
if (user != null && watcher != null) {
UserRequestMessage userRequestMessage = new UserRequestMessage(
"User request",
"Allow user <b>" + watcher.getName() + "</b> for this match to see your hand cards?<br>" +
"(You can revoke this every time using related popup menu item of your battlefield.)"
, PlayerAction.REQUEST_PERMISSION_TO_SEE_HAND_CARDS);
"Allow user <b>" + watcher.getName() + "</b> for this match to see your hand cards?<br>"
+ "(You can revoke this every time using related popup menu item of your battlefield.)", PlayerAction.REQUEST_PERMISSION_TO_SEE_HAND_CARDS);
userRequestMessage.setRelatedUser(watcherId, watcher.getName());
userRequestMessage.setGameId(game.getId());
userRequestMessage.setButton1("Accept", PlayerAction.ADD_PERMISSION_TO_SEE_HAND_CARDS);
@ -298,39 +292,39 @@ public class GameSessionPlayer extends GameSessionWatcher {
final Player player = game.getPlayer(playerId);
if (player != null && player.isInGame()) {
callExecutor.execute(
new Runnable() {
@Override
public void run() {
try {
if (game.getStartTime() == null) {
// gameController is still waiting to start the game
player.leave();
} else {
// game was already started
player.quit(game);
}
} catch (Exception ex) {
if (ex != null) {
// It seems this can happen if two threads try to end the game at the exact same time (one wins and one ends here)
logger.fatal("Game session game quit exception " + (ex.getMessage() == null ? "null":ex.getMessage()));
logger.debug("- gameId:" + game.getId() +" playerId: " + playerId);
if (ex.getCause() != null) {
logger.debug("- Cause: " + (ex.getCause().getMessage() == null ? "null":ex.getCause().getMessage()), ex);
new Runnable() {
@Override
public void run() {
try {
if (game.getStartTime() == null) {
// gameController is still waiting to start the game
player.leave();
} else {
logger.debug("- ex: " + ex.toString(), ex);
// game was already started
player.quit(game);
}
} catch (Exception ex) {
if (ex != null) {
// It seems this can happen if two threads try to end the game at the exact same time (one wins and one ends here)
logger.fatal("Game session game quit exception " + (ex.getMessage() == null ? "null" : ex.getMessage()));
logger.debug("- gameId:" + game.getId() + " playerId: " + playerId);
if (ex.getCause() != null) {
logger.debug("- Cause: " + (ex.getCause().getMessage() == null ? "null" : ex.getCause().getMessage()), ex);
} else {
logger.debug("- ex: " + ex.toString(), ex);
}
} else {
logger.fatal("Game session game quit exception - null gameId:" + game.getId() + " playerId: " + playerId);
}
}else {
logger.fatal("Game session game quit exception - null gameId:" + game.getId() +" playerId: " + playerId);
}
}
}
}
);
}
} else {
logger.error("game object missing playerId: " + (playerId == null ? "[null]":playerId));
logger.error("game object missing playerId: " + (playerId == null ? "[null]" : playerId));
}
}

7
Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
View file

@ -118,7 +118,12 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
users.add(new UsersView(user.getUserData().getFlagName(), user.getName(), user.getInfo(), user.getGameInfo(), session.getPingInfo()));
} catch (Exception ex) {
logger.fatal("User update exception: " + user.getName() + " - " + ex.toString(), ex);
users.add(new UsersView(user.getUserData().getFlagName(), user.getName(), user.getInfo(), "[exception]", session.getPingInfo()));
users.add(new UsersView(
(user.getUserData() != null && user.getUserData().getFlagName() != null) ? user.getUserData().getFlagName() : "world",
user.getName() != null ? user.getName() : "<no name>",
user.getInfo() != null ? user.getInfo() : "<no info>",
"[exception]",
session.getPingInfo() != null ? session.getPingInfo() : "<no ping>"));
}
}