External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 19:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Some changes to game handling to support replay in the future (not working yet).

Browse source
This commit is contained in:
LevelX2 2014-02-07 16:07:15 +01:00
parent 9a15bdb933
commit e6f55d3b80
10 changed files with 55 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -345,13 +345,13 @@ public class TableController {
}
}
public boolean replayTable(UUID userId) {
if (table.getState() != TableState.FINISHED) {
return false;
}
ReplayManager.getInstance().replayGame(table.getId(), userId);
return true;
}
// public boolean replayTable(UUID userId) {
// if (table.getState() != TableState.FINISHED) {
// return false;
// }
// ReplayManager.getInstance().replayGame(table.getId(), userId);
// return true;
// }
private Player createPlayer(String name, String playerType, int skill) {
Player player;

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

@ -249,12 +249,12 @@ public class TableManager {
return false;
}
public boolean replayTable(UUID userId, UUID tableId) {
if (controllers.containsKey(tableId)) {
return controllers.get(tableId).replayTable(userId);
}
return false;
}
// public boolean replayTable(UUID userId, UUID tableId) {
// if (controllers.containsKey(tableId)) {
// return controllers.get(tableId).replayTable(userId);
// }
// return false;
// }
public void endGame(UUID tableId) {
if (controllers.containsKey(tableId)) {

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

@ -35,7 +35,6 @@ import java.util.Map.Entry;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import mage.cards.decks.Deck;
import mage.constants.TableState;
import mage.game.Table;
import mage.interfaces.callback.ClientCallback;
import mage.players.net.UserData;

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

@ -111,6 +111,7 @@ public class GameController implements GameCallback {
this.userPlayerMap = userPlayerMap;
chatId = ChatManager.getInstance().createChatSession();
this.game = game;
this.game.setSaveGame(ConfigSettings.getInstance().isSaveGameActivated());
this.tableId = tableId;
this.choosingPlayerId = choosingPlayerId;
for (Player player: game.getPlayers().values()) {

3
Mage.Server/src/main/java/mage/server/game/ReplayManager.java
View file

@ -73,5 +73,8 @@ public class ReplayManager {
replaySessions.get(gameId.toString() + userId.toString()).next(moves);
}
public void endReplay(UUID gameId, UUID userId) {
replaySessions.remove(gameId.toString() + userId.toString());
}
}

5
Mage.Server/src/main/java/mage/server/game/ReplaySession.java
View file

@ -35,7 +35,6 @@ import mage.interfaces.callback.ClientCallback;
import mage.server.User;
import mage.server.UserManager;
import mage.view.GameView;
import org.apache.log4j.Logger;
/**
*
@ -43,8 +42,7 @@ import org.apache.log4j.Logger;
*/
public class ReplaySession implements GameCallback {
private static final Logger logger = Logger.getLogger(ReplaySession.class);
private GameReplay replay;
private final GameReplay replay;
protected UUID userId;
ReplaySession(UUID gameId, UUID userId) {
@ -85,6 +83,7 @@ public class ReplaySession implements GameCallback {
if (user != null) {
user.fireCallback(new ClientCallback("replayDone", replay.getGame().getId(), result));
}
ReplayManager.getInstance().endReplay(replay.getGame().getId(), userId);
}
private void updateGame(final GameState state, Game game) {