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

Fixed hasArgs

Browse Source
This commit is contained in:
lieght
2025-12-13 17:53:31 +01:00
parent a9145d44cf
commit afcd9be71e
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/src/main/java/org/toop/framework/networking/server/ServerHandler.java → framework/src/main/java/org/toop/framework/networking/server/ConnectionHandler.java
View File

@@ -9,12 +9,12 @@ import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
public class ServerHandler extends SimpleChannelInboundHandler<String> { public class ConnectionHandler extends SimpleChannelInboundHandler<String> {
private final User user; private final User user;
private final Server server; private final Server server;
public ServerHandler(User user, Server server) { public ConnectionHandler(User user, Server server) {
this.user = user; this.user = user;
this.server = server; this.server = server;
} }
@@ -54,19 +54,19 @@ public class ServerHandler extends SimpleChannelInboundHandler<String> {
} }
} }
// DO NOT INVERT
private boolean hasArgs(String... args) { private boolean hasArgs(String... args) {
return (args.length >= 1); return (args.length >= 1);
} }
private void handleLogin(ParsedMessage p) { private void handleLogin(ParsedMessage p) {
if (!hasArgs(p.args())) return;
if (hasArgs(p.args())) return;
user.setName(p.args()[0]); user.setName(p.args()[0]);
} }
private void handleGet(ParsedMessage p) { private void handleGet(ParsedMessage p) {
if (hasArgs(p.args())) return; if (!hasArgs(p.args())) return;
switch (p.args()[0]) { switch (p.args()[0]) {
case "playerlist" -> { case "playerlist" -> {
@@ -93,7 +93,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<String> {
} }
private void handleChallenge(ParsedMessage p) { private void handleChallenge(ParsedMessage p) {
if(hasArgs(p.args())) return; if (!hasArgs(p.args())) return;
if (p.args().length < 2) return; if (p.args().length < 2) return;
if (p.args()[0].equalsIgnoreCase("accept")) { if (p.args()[0].equalsIgnoreCase("accept")) {
@@ -118,7 +118,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<String> {
} }
private void handleMove(ParsedMessage p) { private void handleMove(ParsedMessage p) {
if(hasArgs(p.args())) return; if(!hasArgs(p.args())) return;
// TODO check if not number // TODO check if not number
user.serverPlayer().setMove(1L << Integer.parseInt(p.args()[0])); user.serverPlayer().setMove(1L << Integer.parseInt(p.args()[0]));

3
framework/src/main/java/org/toop/framework/networking/server/MasterServer.java
View File

@@ -12,7 +12,6 @@ import io.netty.handler.codec.string.StringEncoder;
import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LogLevel;
import io.netty.handler.logging.LoggingHandler; import io.netty.handler.logging.LoggingHandler;
import org.toop.framework.SnowflakeGenerator; import org.toop.framework.SnowflakeGenerator;
import org.toop.framework.game.BitboardGame;
import org.toop.framework.gameFramework.model.game.TurnBasedGame; import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import java.time.Duration; import java.time.Duration;
@@ -53,7 +52,7 @@ public class MasterServer {
long userid = SnowflakeGenerator.nextId(); long userid = SnowflakeGenerator.nextId();
User user = new User(userid, ""+userid); User user = new User(userid, ""+userid);
pipeline.addLast(new ServerHandler(user, gs)); pipeline.addLast(new ConnectionHandler(user, gs));
} }
} }
); );

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

@@ -168,13 +168,6 @@ public class Server implements GameServer {
} catch (Exception ignored) {} } catch (Exception ignored) {}
} }
// public void checkGames() {
// for (int i = games.size() - 1; i >= 0; i--) {
// var game = games.get(i);
// if (game.game().getWinner() >= 0) games.remove(i);
// }
// }
public List<User> onlineUsers() { public List<User> onlineUsers() {
return users.values().stream().toList(); return users.values().stream().toList();
} }