From 89a9cb1e559ab98a184ae224d93d3c102e4cb0a2 Mon Sep 17 00:00:00 2001 From: lieght <49651652+BAFGdeJong@users.noreply.github.com> Date: Sat, 13 Dec 2025 17:37:34 +0100 Subject: [PATCH] Using pairs now in server.java --- .../toop/framework/networking/server/Server.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/framework/src/main/java/org/toop/framework/networking/server/Server.java b/framework/src/main/java/org/toop/framework/networking/server/Server.java index 7f0f71c..bc8742a 100644 --- a/framework/src/main/java/org/toop/framework/networking/server/Server.java +++ b/framework/src/main/java/org/toop/framework/networking/server/Server.java @@ -1,11 +1,8 @@ package org.toop.framework.networking.server; -import org.toop.framework.game.gameThreads.OnlineThreadBehaviour; -import org.toop.framework.game.players.LocalPlayer; -import org.toop.framework.game.players.OnlinePlayer; import org.toop.framework.game.players.ServerPlayer; import org.toop.framework.gameFramework.model.game.TurnBasedGame; -import org.toop.framework.gameFramework.model.player.Player; +import org.toop.framework.utils.ImmutablePair; import java.util.Arrays; import java.util.List; @@ -147,14 +144,18 @@ public class Server implements GameServer { if (!gameTypes.containsKey(gameType)) return; try { - Player[] players = new Player[users.length]; + ServerPlayer[] players = new ServerPlayer[users.length]; + var game = new Game(gameTypes.get(gameType).getDeclaredConstructor().newInstance(), users); + for (int i = 0; i < users.length; i++) { players[i] = new ServerPlayer(users[i]); + users[i].addGame(new ImmutablePair<>(game, players[i])); } System.out.println("Starting Game"); - var game = new Game(gameTypes.get(gameType).getDeclaredConstructor().newInstance(), users); + game.game().init(players); games.addLast(game); + users[0].sendMessage(String.format("SVR GAME MATCH {PLAYERTOMOVE: \"%s\", GAMETYPE: \"%s\", OPPONENT: \"%s\"}\n", users[0].name(), gameType,