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

fixed replay + some other fixes

Browse source
This commit is contained in:
BetaSteward 2011-03-18 18:27:01 -04:00
parent ff3e0108cd
commit 35f0767f1b
24 changed files with 218 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Mage.Server/src/main/java/mage/server/ServerImpl.java
View file

@ -37,8 +37,6 @@ import java.rmi.server.UnicastRemoteObject;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.logging.Level;
import java.util.logging.Logger;
import mage.cards.decks.DeckCardLists;
import mage.game.GameException;
import mage.interfaces.MageException;
@ -57,12 +55,12 @@ import mage.server.game.ReplayManager;
import mage.server.tournament.TournamentFactory;
import mage.server.tournament.TournamentManager;
import mage.server.util.ThreadExecutor;
import mage.util.Logging;
import mage.view.ChatMessage.MessageColor;
import mage.view.DraftPickView;
import mage.view.GameView;
import mage.view.TableView;
import mage.view.TournamentView;
import org.apache.log4j.Logger;
/**
*
@ -70,7 +68,7 @@ import mage.view.TournamentView;
*/
public class ServerImpl extends RemoteServer implements Server {
private final static Logger logger = Logging.getLogger("Mage Server");
private final static Logger logger = Logger.getLogger("Mage Server");
private static ExecutorService rmiExecutor = ThreadExecutor.getInstance().getRMIExecutor();
private boolean testMode;
@ -86,9 +84,9 @@ public class ServerImpl extends RemoteServer implements Server {
if (testMode)
logger.info("MAGE server running in test mode");
} catch (ExportException ex) {
logger.severe("ERROR: Unable to start Mage Server - another server is likely running");
logger.fatal("ERROR: Unable to start Mage Server - another server is likely running");
} catch (RemoteException ex) {
logger.log(Level.SEVERE, "Failed to start RMI server at port " + port, ex);
logger.fatal("Failed to start RMI server at port " + port, ex);
}
}
@ -136,7 +134,7 @@ public class ServerImpl extends RemoteServer implements Server {
public TableView createTournamentTable(UUID sessionId, UUID roomId, TournamentOptions options) throws MageException {
try {
TableView table = GamesRoomManager.getInstance().getRoom(roomId).createTournamentTable(sessionId, options);
logger.log(Level.INFO, "Tournament table {0} created", table.getTableId());
logger.info("Tournament table " + table.getTableId() + " created");
return table;
}
catch (Exception ex) {
@ -636,13 +634,13 @@ public class ServerImpl extends RemoteServer implements Server {
}
@Override
public void replayGame(final UUID gameID, final UUID sessionId) throws MageException {
public void replayGame(final UUID gameId, final UUID sessionId) throws MageException {
try {
rmiExecutor.execute(
new Runnable() {
@Override
public void run() {
ReplayManager.getInstance().startReplay(sessionId);
ReplayManager.getInstance().replayGame(gameId, sessionId);
}
}
);
@ -653,13 +651,13 @@ public class ServerImpl extends RemoteServer implements Server {
}
@Override
public void stopReplay(final UUID sessionId) throws MageException {
public void startReplay(final UUID gameId, final UUID sessionId) throws MageException {
try {
rmiExecutor.execute(
new Runnable() {
@Override
public void run() {
ReplayManager.getInstance().stopReplay(sessionId);
ReplayManager.getInstance().startReplay(gameId, sessionId);
}
}
);
@ -670,13 +668,13 @@ public class ServerImpl extends RemoteServer implements Server {
}
@Override
public void nextPlay(final UUID sessionId) throws MageException {
public void stopReplay(final UUID gameId, final UUID sessionId) throws MageException {
try {
rmiExecutor.execute(
new Runnable() {
@Override
public void run() {
ReplayManager.getInstance().nextPlay(sessionId);
ReplayManager.getInstance().stopReplay(gameId, sessionId);
}
}
);
@ -687,13 +685,13 @@ public class ServerImpl extends RemoteServer implements Server {
}
@Override
public void previousPlay(final UUID sessionId) throws MageException {
public void nextPlay(final UUID gameId, final UUID sessionId) throws MageException {
try {
rmiExecutor.execute(
new Runnable() {
@Override
public void run() {
ReplayManager.getInstance().previousPlay(sessionId);
ReplayManager.getInstance().nextPlay(gameId, sessionId);
}
}
);
@ -704,14 +702,20 @@ public class ServerImpl extends RemoteServer implements Server {
}
@Override
public boolean replayTable(UUID sessionId, UUID roomId, UUID tableId) throws MageException {
public void previousPlay(final UUID gameId, final UUID sessionId) throws MageException {
try {
return TableManager.getInstance().replayTable(sessionId, tableId);
rmiExecutor.execute(
new Runnable() {
@Override
public void run() {
ReplayManager.getInstance().previousPlay(gameId, sessionId);
}
}
);
}
catch (Exception ex) {
handleException(ex);
}
return false;
}
@Override
@ -758,7 +762,7 @@ public class ServerImpl extends RemoteServer implements Server {
}
public void handleException(Exception ex) throws MageException {
logger.log(Level.SEVERE, "", ex);
logger.fatal("", ex);
throw new MageException("Server error: " + ex.getMessage());
}

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

@ -114,8 +114,8 @@ public class Session {
fireCallback(new ClientCallback("watchGame", gameId));
}
public void replayGame() {
fireCallback(new ClientCallback("replayGame", null));
public void replayGame(final UUID gameId) {
fireCallback(new ClientCallback("replayGame", gameId));
}
public void ack(String message) {

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

@ -32,30 +32,14 @@ import mage.server.draft.DraftManager;
import mage.server.tournament.TournamentFactory;
import mage.server.tournament.TournamentManager;
import mage.game.Table;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.util.Map.Entry;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
import mage.Constants.RangeOfInfluence;
import mage.Constants.TableState;
import mage.cards.decks.Deck;
import mage.cards.decks.DeckCardLists;
import mage.game.Game;
import mage.game.GameException;
import mage.game.GameStates;
import mage.game.match.Match;
import mage.game.Seat;
import mage.game.draft.Draft;
@ -63,18 +47,15 @@ import mage.game.draft.DraftPlayer;
import mage.game.events.Listener;
import mage.game.events.TableEvent;
import mage.game.match.MatchOptions;
import mage.game.match.MatchPlayer;
import mage.game.tournament.Tournament;
import mage.game.tournament.TournamentOptions;
import mage.players.Player;
import mage.server.game.DeckValidatorFactory;
import mage.server.game.GameFactory;
import mage.server.game.GameManager;
import mage.server.game.GameReplay;
import mage.server.game.PlayerFactory;
import mage.server.game.ReplayManager;
import mage.util.CopierObjectInputStream;
import mage.util.Logging;
import org.apache.log4j.Logger;
/**
*
@ -82,7 +63,7 @@ import mage.util.Logging;
*/
public class TableController {
private final static Logger logger = Logging.getLogger(TableController.class.getName());
private final static Logger logger = Logger.getLogger(TableController.class);
private UUID sessionId;
private UUID chatId;
@ -97,7 +78,7 @@ public class TableController {
chatId = ChatManager.getInstance().createChatSession();
this.options = options;
match = GameFactory.getInstance().createMatch(options.getGameType(), options);
table = new Table(options.getGameType(), options.getName(), DeckValidatorFactory.getInstance().createDeckValidator(options.getDeckType()), options.getPlayerTypes(), false);
table = new Table(options.getGameType(), options.getName(), DeckValidatorFactory.getInstance().createDeckValidator(options.getDeckType()), options.getPlayerTypes(), match);
init();
}
@ -105,7 +86,7 @@ public class TableController {
this.sessionId = sessionId;
chatId = ChatManager.getInstance().createChatSession();
tournament = TournamentFactory.getInstance().createTournament(options.getTournamentType(), options);
table = new Table(options.getTournamentType(), options.getName(), DeckValidatorFactory.getInstance().createDeckValidator(options.getMatchOptions().getDeckType()), options.getPlayerTypes(), true);
table = new Table(options.getTournamentType(), options.getName(), DeckValidatorFactory.getInstance().createDeckValidator(options.getMatchOptions().getDeckType()), options.getPlayerTypes(), tournament);
}
private void init() {
@ -215,13 +196,6 @@ public class TableController {
return true;
}
public GameReplay createReplay() {
if (table.getState() == TableState.FINISHED) {
return new GameReplay(loadGame());
}
return null;
}
public boolean replayTable(UUID sessionId) {
if (table.getState() != TableState.FINISHED) {
return false;
@ -263,7 +237,7 @@ public class TableController {
match.startMatch();
startGame(null);
} catch (GameException ex) {
logger.log(Level.SEVERE, null, ex);
logger.fatal(null, ex);
}
}
}
@ -315,7 +289,7 @@ public class TableController {
UUID choosingPlayerId = match.getChooser();
match.endGame();
table.endGame();
saveGame();
GameManager.getInstance().saveGame(match.getGame().getId());
GameManager.getInstance().removeGame(match.getGame().getId());
try {
if (!match.isMatchOver()) {
@ -324,7 +298,7 @@ public class TableController {
startGame(choosingPlayerId);
}
} catch (GameException ex) {
logger.log(Level.SEVERE, null, ex);
logger.fatal(null, ex);
}
}
@ -348,49 +322,6 @@ public class TableController {
}
}
private void saveGame() {
try {
OutputStream file = new FileOutputStream("saved/" + match.getGame().getId().toString() + ".game");
OutputStream buffer = new BufferedOutputStream(file);
ObjectOutput output = new ObjectOutputStream(new GZIPOutputStream(buffer));
try {
output.writeObject(match.getGame());
output.writeObject(match.getGame().getGameStates());
}
finally {
output.close();
}
logger.log(Level.INFO, "Saved game:" + match.getGame().getId());
}
catch(IOException ex) {
logger.log(Level.SEVERE, "Cannot save game.", ex);
}
}
private Game loadGame() {
try{
InputStream file = new FileInputStream("saved/" + match.getGame().getId().toString() + ".game");
InputStream buffer = new BufferedInputStream(file);
ObjectInput input = new CopierObjectInputStream(Main.classLoader, new GZIPInputStream(buffer));
try {
Game game = (Game)input.readObject();
GameStates states = (GameStates)input.readObject();
game.loadGameStates(states);
return game;
}
finally {
input.close();
}
}
catch(ClassNotFoundException ex) {
logger.log(Level.SEVERE, "Cannot load game. Class not found.", ex);
}
catch(IOException ex) {
logger.log(Level.SEVERE, "Cannot load game:" + match.getGame().getId(), ex);
}
return null;
}
public boolean isOwner(UUID sessionId) {
return sessionId.equals(this.sessionId);
}

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

@ -162,10 +162,6 @@ public class TableManager {
controllers.get(tableId).endDraft(draft);
}
public GameReplay createReplay(UUID tableId) {
return controllers.get(tableId).createReplay();
}
public void swapSeats(UUID tableId, UUID sessionId, int seatNum1, int seatNum2) {
if (isTableOwner(tableId, sessionId)) {
controllers.get(tableId).swapSeats(seatNum1, seatNum2);

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

@ -28,8 +28,14 @@
package mage.server.game;
import java.io.BufferedOutputStream;
import mage.server.TableManager;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.*;
import java.util.Map.Entry;
@ -38,6 +44,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.GZIPOutputStream;
import mage.Constants.Zone;
import mage.abilities.Ability;
@ -415,6 +422,25 @@ public class GameController implements GameCallback {
endGame(result);
}
public void saveGame() {
try {
OutputStream file = new FileOutputStream("saved/" + game.getId().toString() + ".game");
OutputStream buffer = new BufferedOutputStream(file);
ObjectOutput output = new ObjectOutputStream(new GZIPOutputStream(buffer));
try {
output.writeObject(game);
output.writeObject(game.getGameStates());
}
finally {
output.close();
}
logger.info("Saved game:" + game.getId());
}
catch(IOException ex) {
logger.fatal("Cannot save game.", ex);
}
}
/**
* Replaces cards in player's hands by specified in config/init.txt.<br/>
* <br/>

9
Mage.Server/src/main/java/mage/server/game/GameManager.java
View file

@ -105,10 +105,6 @@ public class GameManager {
gameControllers.get(gameId).kill(sessionId);
}
// public GameReplay createReplay(UUID gameId) {
// return gameControllers.get(gameId).createReplay();
// }
public void cheat(UUID gameId, UUID sessionId, UUID playerId, DeckCardLists deckList) {
gameControllers.get(gameId).cheat(sessionId, playerId, deckList);
}
@ -125,7 +121,12 @@ public class GameManager {
gameControllers.remove(gameId);
}
public void saveGame(UUID gameId) {
gameControllers.get(gameId).saveGame();
}
public GameView getGameView(UUID gameId, UUID sessionId, UUID playerId) {
return gameControllers.get(gameId).getGameView(playerId);
}
}

41
Mage.Server/src/main/java/mage/server/game/GameReplay.java
View file

@ -28,7 +28,17 @@
package mage.server.game;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInput;
import java.util.UUID;
import java.util.zip.GZIPInputStream;
import mage.game.*;
import mage.server.Main;
import mage.util.CopierObjectInputStream;
import org.apache.log4j.Logger;
/**
*
@ -36,13 +46,15 @@ import mage.game.*;
*/
public class GameReplay {
private final static Logger logger = Logger.getLogger(GameReplay.class);
private GameStates savedGame;
private Game game;
private int stateIndex;
public GameReplay(Game game) {
public GameReplay(UUID gameId) {
this.game = loadGame(gameId);
this.savedGame = game.getGameStates();
this.game = game;
}
public void start() {
@ -66,4 +78,29 @@ public class GameReplay {
public Game getGame() {
return this.game;
}
private Game loadGame(UUID gameId) {
try{
InputStream file = new FileInputStream("saved/" + gameId.toString() + ".game");
InputStream buffer = new BufferedInputStream(file);
ObjectInput input = new CopierObjectInputStream(Main.classLoader, new GZIPInputStream(buffer));
try {
Game loadGame = (Game)input.readObject();
GameStates states = (GameStates)input.readObject();
loadGame.loadGameStates(states);
return loadGame;
}
finally {
input.close();
}
}
catch(ClassNotFoundException ex) {
logger.fatal("Cannot load game. Class not found.", ex);
}
catch(IOException ex) {
logger.fatal("Cannot load game:" + gameId, ex);
}
return null;
}
}

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

@ -45,28 +45,28 @@ public class ReplayManager {
private ReplayManager() {}
private ConcurrentHashMap<UUID, ReplaySession> replaySessions = new ConcurrentHashMap<UUID, ReplaySession>();
private ConcurrentHashMap<String, ReplaySession> replaySessions = new ConcurrentHashMap<String, ReplaySession>();
public void replayGame(UUID sessionId, UUID tableId) {
ReplaySession replaySession = new ReplaySession(tableId, sessionId);
replaySessions.put(sessionId, replaySession);
SessionManager.getInstance().getSession(sessionId).replayGame();
public void replayGame(UUID gameId, UUID sessionId) {
ReplaySession replaySession = new ReplaySession(gameId, sessionId);
replaySessions.put(gameId.toString() + sessionId.toString(), replaySession);
SessionManager.getInstance().getSession(sessionId).replayGame(gameId);
}
public void startReplay(UUID sessionId) {
replaySessions.get(sessionId).replay();
public void startReplay(UUID gameId, UUID sessionId) {
replaySessions.get(gameId.toString() + sessionId.toString()).replay();
}
public void stopReplay(UUID sessionId) {
replaySessions.get(sessionId).stop();
public void stopReplay(UUID gameId, UUID sessionId) {
replaySessions.get(gameId.toString() + sessionId.toString()).stop();
}
public void nextPlay(UUID sessionId) {
replaySessions.get(sessionId).next();
public void nextPlay(UUID gameId, UUID sessionId) {
replaySessions.get(gameId.toString() + sessionId.toString()).next();
}
public void previousPlay(UUID sessionId) {
replaySessions.get(sessionId).previous();
public void previousPlay(UUID gameId, UUID sessionId) {
replaySessions.get(gameId.toString() + sessionId.toString()).previous();
}
}

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

@ -28,15 +28,12 @@
package mage.server.game;
import mage.server.TableManager;
import java.util.UUID;
import java.util.logging.Logger;
import mage.game.Game;
import mage.game.GameState;
import mage.interfaces.callback.ClientCallback;
import mage.server.Session;
import mage.server.SessionManager;
import mage.util.Logging;
import mage.view.GameView;
/**
@ -45,13 +42,11 @@ import mage.view.GameView;
*/
public class ReplaySession implements GameCallback {
private final static Logger logger = Logging.getLogger(ReplaySession.class.getName());
private GameReplay replay;
protected UUID sessionId;
ReplaySession(UUID tableId, UUID sessionId) {
this.replay = TableManager.getInstance().createReplay(tableId);
ReplaySession(UUID gameId, UUID sessionId) {
this.replay = new GameReplay(gameId);
this.sessionId = sessionId;
}