github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-27 03:00:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed errors.

Browse source
This commit is contained in:
maurer.it 2010-12-29 14:56:05 -05:00
parent 3d1688f851
commit 8d93ce524d
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Tests/config/config.xml
View file

@ -9,8 +9,8 @@
<playerType name="Computer - minimax hybrid" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/> <playerType name="Computer - minimax hybrid" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/>
</playerTypes> </playerTypes>
<gameTypes> <gameTypes>
<gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerDuel" typeName="mage.game.TwoPlayerDuelType"/> <gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerMatch" typeName="mage.game.TwoPlayerDuelType"/>
<gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAll" typeName="mage.game.FreeForAllType"/> <gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
</gameTypes> </gameTypes>
<deckTypes> <deckTypes>
<deckType name="Constructed" jar="mage-deck-constructed.jar" className="mage.deck.Constructed"/> <deckType name="Constructed" jar="mage-deck-constructed.jar" className="mage.deck.Constructed"/>

8
Mage.Tests/src/test/java/org/mage/test/base/MageBase.java
View file

@ -15,9 +15,7 @@ import java.rmi.NotBoundException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry; import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry; import java.rmi.registry.Registry;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -104,9 +102,9 @@ public class MageBase {
logger.info("IN >> " + callback.getMessageId() + " - " + callback.getMethod()); logger.info("IN >> " + callback.getMessageId() + " - " + callback.getMethod());
try { try {
if (callback.getMethod().equals("startGame")) { if (callback.getMethod().equals("startGame")) {
UUID[] data = (UUID[]) callback.getData(); TableClientMessage data = (TableClientMessage) callback.getData();
gameId = data[0]; gameId = data.getGameId();
playerId = data[1]; playerId = data.getPlayerId();
server.joinGame(gameId, sessionId); server.joinGame(gameId, sessionId);
} else if (callback.getMethod().equals("gameInit")) { } else if (callback.getMethod().equals("gameInit")) {
server.ack("gameInit", sessionId); server.ack("gameInit", sessionId);