stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix for stuff

Browse Source
This commit is contained in:
Stef
2026-01-07 17:16:45 +01:00
parent c64a2e2c65
commit 65220d9649
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/toop/app/Server.java
View File

@@ -11,6 +11,7 @@ import org.toop.app.widget.popup.ErrorPopup;
import org.toop.app.widget.popup.SendChallengePopup; import org.toop.app.widget.popup.SendChallengePopup;
import org.toop.app.widget.view.ServerView; import org.toop.app.widget.view.ServerView;
import org.toop.framework.eventbus.EventFlow; import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.game.players.ArtificialPlayer;
import org.toop.framework.game.players.OnlinePlayer; import org.toop.framework.game.players.OnlinePlayer;
import org.toop.framework.gameFramework.controller.GameController; import org.toop.framework.gameFramework.controller.GameController;
import org.toop.framework.eventbus.GlobalEventBus; import org.toop.framework.eventbus.GlobalEventBus;
@@ -20,6 +21,7 @@ import org.toop.framework.networking.connection.events.NetworkEvents;
import org.toop.framework.networking.connection.types.NetworkingConnector; import org.toop.framework.networking.connection.types.NetworkingConnector;
import org.toop.framework.networking.server.gateway.NettyGatewayServer; import org.toop.framework.networking.server.gateway.NettyGatewayServer;
import org.toop.game.players.LocalPlayer; import org.toop.game.players.LocalPlayer;
import org.toop.game.players.ai.RandomAI;
import org.toop.local.AppContext; import org.toop.local.AppContext;
import java.util.List; import java.util.List;
@@ -210,15 +212,15 @@ public final class Server {
case TICTACTOE -> { case TICTACTOE -> {
Player[] players = new Player[2]; Player[] players = new Player[2];
players[Math.abs(myTurn-1)] = new OnlinePlayer(response.opponent()); players[Math.abs(myTurn-1)] = new OnlinePlayer(response.opponent());
players[myTurn] = new LocalPlayer(user); // HERE //players[myTurn] = new LocalPlayer(user); // HERE
// players[myTurn] = new ArtificialPlayer(new RandomAI(), user); // HERE players[myTurn] = new ArtificialPlayer(new RandomAI(), user); // HERE
gameController = new TicTacToeBitController(players); gameController = new TicTacToeBitController(players);
} }
case REVERSI -> { case REVERSI -> {
Player[] players = new Player[2]; Player[] players = new Player[2];
players[Math.abs(myTurn-1)] = new OnlinePlayer(response.opponent()); players[Math.abs(myTurn-1)] = new OnlinePlayer(response.opponent());
players[myTurn] = new LocalPlayer(user); // HERE //players[myTurn] = new LocalPlayer(user); // HERE
// players[myTurn] = new ArtificialPlayer(new RandomAI(), user); // HERE players[myTurn] = new ArtificialPlayer(new RandomAI(), user); // HERE
gameController = new ReversiBitController(players);} gameController = new ReversiBitController(players);}
default -> new ErrorPopup("Unsupported game type."); default -> new ErrorPopup("Unsupported game type.");

8
framework/src/main/java/org/toop/framework/game/BitboardGame.java
View File

@@ -47,9 +47,11 @@ public abstract class BitboardGame implements TurnBasedGame {
this.playerBitboard = other.playerBitboard.clone(); this.playerBitboard = other.playerBitboard.clone();
this.currentTurn = other.currentTurn; this.currentTurn = other.currentTurn;
this.players = Arrays.stream(other.players) this.players = other.players;
.map(Player::deepCopy) // TODO: Players are not deep copied, which is bad. I don't know why but deepcopying breaks it. Fix it
.toArray(Player[]::new); //this.players = Arrays.stream(other.players)
// .map(Player::deepCopy)
// .toArray(Player[]::new);
} }
public int getColumnSize() { public int getColumnSize() {