From 8b85915c741dd3f5bbdf62a853bb478b091ef3f4 Mon Sep 17 00:00:00 2001 From: lieght <49651652+BAFGdeJong@users.noreply.github.com> Date: Sat, 13 Dec 2025 17:08:10 +0100 Subject: [PATCH] Fixes --- .../framework/networking/server/Server.java | 2 +- .../networking/server/ServerHandler.java | 3 ++- .../framework/networking/server/ServerUser.java | 4 ++-- .../toop/framework/networking/server/User.java | 17 ++++++++--------- 4 files changed, 13 insertions(+), 13 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 dc35906..4db663c 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 @@ -100,7 +100,7 @@ public class Server implements GameServer { return false; } - if (user.games().length > 0) { + if (user.game() != null) { return false; } diff --git a/framework/src/main/java/org/toop/framework/networking/server/ServerHandler.java b/framework/src/main/java/org/toop/framework/networking/server/ServerHandler.java index f31912f..9cfb9d7 100644 --- a/framework/src/main/java/org/toop/framework/networking/server/ServerHandler.java +++ b/framework/src/main/java/org/toop/framework/networking/server/ServerHandler.java @@ -119,7 +119,8 @@ public class ServerHandler extends SimpleChannelInboundHandler { } private void handleMove(ParsedMessage p) { - // TODO + if(!allowedArgs(p.args())) return; + } private ParsedMessage parse(String msg) { diff --git a/framework/src/main/java/org/toop/framework/networking/server/ServerUser.java b/framework/src/main/java/org/toop/framework/networking/server/ServerUser.java index 474c26d..e2aa97a 100644 --- a/framework/src/main/java/org/toop/framework/networking/server/ServerUser.java +++ b/framework/src/main/java/org/toop/framework/networking/server/ServerUser.java @@ -3,9 +3,9 @@ package org.toop.framework.networking.server; public interface ServerUser { long id(); String name(); - Game[] games(); + Game game(); void addGame(Game game); - void removeGame(Game game); + void removeGame(); void setName(String name); void sendMessage(String message); } diff --git a/framework/src/main/java/org/toop/framework/networking/server/User.java b/framework/src/main/java/org/toop/framework/networking/server/User.java index 9863b12..9a52587 100644 --- a/framework/src/main/java/org/toop/framework/networking/server/User.java +++ b/framework/src/main/java/org/toop/framework/networking/server/User.java @@ -2,13 +2,10 @@ package org.toop.framework.networking.server; import io.netty.channel.ChannelHandlerContext; -import java.util.ArrayList; -import java.util.List; - public class User implements ServerUser { final private long id; private String name; - private final List games = new ArrayList<>(); + private Game game; private ChannelHandlerContext connectionContext; public User(long userId, String name) { @@ -30,17 +27,19 @@ public class User implements ServerUser { @Override public void addGame(Game game) { - games.add(game); + if (this.game == null) { + this.game = game; + } } @Override - public void removeGame(Game game) { - games.remove(game); + public void removeGame() { + this.game = null; } @Override - public Game[] games() { - return games.toArray(new Game[0]); + public Game game() { + return this.game; } @Override