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

Removed user from subscription if in a game

Browse Source
This commit is contained in:
lieght
2025-12-14 13:11:55 +01:00
parent 2d9b34b7f6
commit 34c85ec472
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
framework/src/main/java/org/toop/framework/networking/server/Server.java
View File

@@ -128,14 +128,8 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
@Override
public void startGame(String gameType, NettyClient... clients) {
IO.println("------------------------------------------");
IO.println("USERS: " + clients.length + " " + Arrays.stream(clients).toList().toString());
if (!gameTypesStore.all().containsKey(gameType)) return;
IO.println("------------------------------------------");
try {
ServerPlayer[] players = new ServerPlayer[clients.length];
var game = new OnlineTurnBasedGame(gameTypesStore.create(gameType), clients);
@@ -207,7 +201,6 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
if (userNames.size() < 2) continue;
while (userNames.size() > 1) {
// TODO: Make sure users aren't currently in a game.
int left = ran.nextInt(userNames.size());
int right;
do {
@@ -217,8 +210,23 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
String userLeft = userNames.get(left);
String userRight = userNames.get(right);
// Remove user if he is in a game
boolean userInGame = false;
if (getUser(userLeft).game() != null) {
userNames.remove(userLeft);
userInGame = true;
} else if (getUser(userRight).game() != null) {
userNames.remove(userRight);
userInGame = true;
}
if (userInGame) { continue; }
//
int first = Math.max(left, right);
int second = Math.min(left, right);
userNames.remove(first);
userNames.remove(second);