From f72f7c4216cefe4c6e2c30dc9919b5d8034bd59e Mon Sep 17 00:00:00 2001 From: cirakg Date: Fri, 30 Dec 2022 08:04:27 +0100 Subject: Ispravljen refuse. --- src/main/java/pokemon/Server.java | 22 ++++++++++------------ src/main/java/ui/MainFrame.java | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pokemon/Server.java b/src/main/java/pokemon/Server.java index bf84756..6a555f2 100644 --- a/src/main/java/pokemon/Server.java +++ b/src/main/java/pokemon/Server.java @@ -26,7 +26,7 @@ public class Server implements Runnable { HashMap players = new HashMap(); ArrayList inGame=new ArrayList(); IService s; - ByteBuffer bb = ByteBuffer.allocate(1024); + ByteBuffer bb = ByteBuffer.allocate(2048); public static void main(String[] args) { Server server=new Server(); @@ -249,11 +249,11 @@ public class Server implements Runnable { inGame.remove(sc); inGame.remove(opponentSocket); games.remove(game); - sendAvailablePlayers(); ByteBuffer buff = ByteBuffer.wrap("REFUSEGAME".getBytes()); sc.write(buff); ByteBuffer buff1 = ByteBuffer.wrap("REFUSEGAME".getBytes()); opponentSocket.write(buff1); + sendAvailablePlayers(); @@ -274,18 +274,16 @@ public class Server implements Runnable { } public void sendAvailablePlayers() throws Exception{ System.out.println("PlayerAddedRemovedOrJoinedGame"); + UserListWrapper wp=new UserListWrapper(); + for(Entry player1:players.entrySet()) { + if(!inGame.contains(player1.getKey())) { + User temp=s.getUserById(player1.getValue()); + if(temp != null) + wp.users.add(temp); + } + } for(Entry player : players.entrySet()) { SocketChannel sc=player.getKey(); - UserListWrapper wp=new UserListWrapper(); - for(Entry player1:players.entrySet()) { - if(!inGame.contains(player1.getKey())) { - User temp=s.getUserById(player1.getValue()); - if(temp != null) - wp.users.add(temp); - } - - - } ByteBuffer buff = ByteBuffer.wrap(wp.toString().getBytes()); sc.write(buff); diff --git a/src/main/java/ui/MainFrame.java b/src/main/java/ui/MainFrame.java index c3c974d..16fc4ef 100644 --- a/src/main/java/ui/MainFrame.java +++ b/src/main/java/ui/MainFrame.java @@ -40,7 +40,7 @@ public class MainFrame extends JFrame implements Runnable { MainFrame frame = new MainFrame(); frame.setVisible(true); } - public ByteBuffer readBuffer=ByteBuffer.allocate(1024); + public ByteBuffer readBuffer=ByteBuffer.allocate(2048); public SocketChannel client; public LoginPanel loginPanel=null; public ChooseOpponentPanel chooseOpponentPanel=null; -- cgit v1.2.3