Fix errors
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
import pp.mdga.client.view.GameView;
|
||||
import pp.mdga.client.view.LobbyView;
|
||||
import pp.mdga.notification.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
||||
@@ -9,6 +9,10 @@
|
||||
import com.jme3.network.serializing.Serializer;
|
||||
import pp.mdga.game.Game;
|
||||
import pp.mdga.game.Player;
|
||||
import pp.mdga.message.client.*;
|
||||
import pp.mdga.message.client.ClientMessage;
|
||||
import pp.mdga.message.server.*;
|
||||
import pp.mdga.message.server.ServerMessage;
|
||||
import pp.mdga.server.ServerGameLogic;
|
||||
import pp.mdga.server.ServerSender;
|
||||
|
||||
@@ -53,7 +57,7 @@ public static void main(String[] args) {
|
||||
*/
|
||||
public MdgaServer() {
|
||||
LOGGER.log(Level.INFO, "Creating MdgaServer"); //NON-NLS
|
||||
logic = new ServerGameLogic(new Game(), this);
|
||||
logic = null;//new ServerGameLogic(new Game(), this);
|
||||
}
|
||||
|
||||
public void run() {
|
||||
@@ -166,13 +170,13 @@ public void messageReceived(HostedConnection source, Message message) {
|
||||
@Override
|
||||
public void connectionAdded(Server server, HostedConnection hostedConnection) {
|
||||
LOGGER.log(Level.INFO, "new connection {0}", hostedConnection); //NON-NLS
|
||||
logic.addPlayer(hostedConnection.getId());
|
||||
//logic.addPlayer(hostedConnection.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void connectionRemoved(Server server, HostedConnection hostedConnection) {
|
||||
LOGGER.log(Level.INFO, "connection closed: {0}", hostedConnection); //NON-NLS
|
||||
final Player player = logic.getPlayerById(hostedConnection.getId());
|
||||
final Player player = null;// = logic.getPlayerById(hostedConnection.getId());
|
||||
if (player == null)
|
||||
LOGGER.log(Level.INFO, "closed connection does not belong to an active player"); //NON-NLS
|
||||
else { //NON-NLS
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package pp.mdga.client;
|
||||
|
||||
import pp.mdga.client.gameState.turnState.choosePieceState.StartPiece;
|
||||
import pp.mdga.game.Game;
|
||||
import pp.mdga.message.client.ClientMessage;
|
||||
import pp.mdga.message.server.*;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import pp.mdga.client.ClientGameLogic;
|
||||
import pp.mdga.client.ClientState;
|
||||
import pp.mdga.client.gameState.determineStartPlayer.DetermineStartPlayerStateMachine;
|
||||
import pp.mdga.client.gameState.determineStartPlayerState.DetermineStartPlayerStateMachine;
|
||||
|
||||
public class DetermineStartPlayer extends GameStates {
|
||||
private final DetermineStartPlayerStateMachine determineStartPlayerStateMachine;
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package pp.mdga.client.gameState.determineStartPlayer;
|
||||
package pp.mdga.client.gameState.determineStartPlayerState;
|
||||
|
||||
import pp.mdga.client.ClientGameLogic;
|
||||
import pp.mdga.client.ClientState;
|
||||
import pp.mdga.client.ClientStateMachine;
|
||||
import pp.mdga.client.RollRankingDice;
|
||||
|
||||
public class DetermineStartPlayerStateMachine extends ClientStateMachine {
|
||||
public DetermineStartPlayerStateMachine(ClientState parent, ClientGameLogic logic) {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
import pp.mdga.client.ClientGameLogic;
|
||||
import pp.mdga.client.ClientState;
|
||||
import pp.mdga.client.gameState.determineStartPlayer.DetermineStartPlayerStates;
|
||||
|
||||
public class RollRankingDice extends DetermineStartPlayerStates {
|
||||
public RollRankingDice(ClientState parent, ClientGameLogic logic) {
|
||||
|
||||
@@ -383,7 +383,7 @@ public void setAllReady(Boolean allReady) {
|
||||
*/
|
||||
public void notifyObservers() {
|
||||
for (Observer observer : new ArrayList<>(observers)) {
|
||||
observer.update();
|
||||
//observer.update();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package pp.mdga.server;
|
||||
|
||||
public class DetermineStartPlayer extends Game {
|
||||
public class DetermineStartPlayer extends GameState {
|
||||
public DetermineStartPlayer(ServerGameLogic logic) {
|
||||
super(logic);
|
||||
}
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
import pp.mdga.game.Game;
|
||||
import pp.mdga.message.client.*;
|
||||
import pp.mdga.message.server.NoTurn;
|
||||
import pp.mdga.message.server.StartPiece;
|
||||
|
||||
import java.lang.System.Logger;
|
||||
|
||||
@@ -17,7 +15,7 @@ public class ServerGameLogic implements ClientInterpreter {
|
||||
private final ServerState state;
|
||||
|
||||
private final ServerState lobby = new Lobby(this);
|
||||
private final ServerState game = new Game(this);
|
||||
private final ServerState gameState = new GameState(this);
|
||||
private final ServerState interrupt = new Interrupt(this);
|
||||
private final ServerState ceremony = new Ceremony(this);
|
||||
private final ServerState turn = new Turn(this);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package pp.mdga.server;
|
||||
|
||||
public class Turn extends Game {
|
||||
public class Turn extends GameState {
|
||||
public Turn(ServerGameLogic logic) {
|
||||
super(logic);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user