Fix errors

This commit is contained in:
Felix
2024-11-27 08:42:45 +01:00
parent 75b53f8309
commit 06e2d831ef
10 changed files with 14 additions and 14 deletions

View File

@@ -2,6 +2,7 @@
import pp.mdga.client.view.GameView;
import pp.mdga.client.view.LobbyView;
import pp.mdga.notification.*;
import java.util.ArrayList;

View File

@@ -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

View File

@@ -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.*;

View File

@@ -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;

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -383,7 +383,7 @@ public void setAllReady(Boolean allReady) {
*/
public void notifyObservers() {
for (Observer observer : new ArrayList<>(observers)) {
observer.update();
//observer.update();
}
}

View File

@@ -1,6 +1,6 @@
package pp.mdga.server;
public class DetermineStartPlayer extends Game {
public class DetermineStartPlayer extends GameState {
public DetermineStartPlayer(ServerGameLogic logic) {
super(logic);
}

View File

@@ -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);

View File

@@ -1,6 +1,6 @@
package pp.mdga.server;
public class Turn extends Game {
public class Turn extends GameState {
public Turn(ServerGameLogic logic) {
super(logic);
}