seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
309 Commits 1 Branch 0 Tags
Commit Graph

196 Commits

Author SHA1 Message Date
Jonas
503808941b Deleted unused classes, implemented whisper chat, other small fixes & adjustments. 2022-04-12 22:16:34 +02:00
Jonas
8aad32bd2d Several small adjustments. Nothing major, pushing so i can continue coding on other PC 2022-04-12 20:04:23 +02:00
Jonas
920ea3fba9 Implemented broadcast to all clients across lobbies (/b), other small changes to chat & leaving lobbies: 
-bugfix for LEAVL
-/c now defaults to message within lobby
-broadcast chat to lobby when called by someone outside lobby just broadcasts to all clients not in lobbies
 2022-04-12 11:38:40 +02:00
Jonas
01b08e41b8 Implemented (almost) all required Lobby functionality. Also added Client_01 and CLient_02 for testing inside intelliJ 2022-04-11 23:05:39 +02:00
Jonas
33cbb4e57d Client Login into Lobby as well as creating a lobby now works and client can only be in one lobby at the same time. 2022-04-11 18:08:39 +02:00
Jonas
42e2720016 Merge remote-tracking branch 'origin/master' into buddaLobbySebastian 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java
 2022-04-11 16:19:58 +02:00
Jonas
240a44d1c3 Several small adjustments to lobby structure 2022-04-11 16:17:35 +02:00
Sebastian Lenzlinger
7df07b490a Getting fuzzyyy. Added LLIST server response. cannot continue. 2022-04-08 19:47:27 +02:00
Sebastian Lenzlinger
e9cade1528 listAllLobbiesToClient still does not work properly: TODO added. 2022-04-08 19:30:50 +02:00
Sebastian Lenzlinger
da5189311e Changed functionality of listAllLobbiesToClient(): 
Now it writes to the OutPutStream itself instead of sending a CHATM to client. Hope is that the JClientParser only has to parse once.
 2022-04-08 19:28:01 +02:00
Sebastian Lenzlinger
e23a749f55 Changed the way LISTL was implemented since it caused problems for the parser of the client. 2022-04-08 19:12:02 +02:00
Sebastian Lenzlinger
a10ea16d35 Added some Documenting. Added some fields to ClientAttributes.java that might be useful in case we need this class. 2022-04-08 18:55:21 +02:00
Sebastian Lenzlinger
d8692152b4 If a client connection is closed the ClientHandleris now removed from the set of all clients on the server and from any lobby he was in. 2022-04-08 18:38:59 +02:00
Jonas
9583cd56e1 added all necessary documentation to Protocol.java 2022-04-08 18:02:23 +02:00
Sebastian Lenzlinger
b55494c106 Added ClientAttributes.java for possible future use. 2022-04-08 17:58:12 +02:00
Sebastian Lenzlinger
24dceee1d8 Added method to remove disconnected client from central data. client handler uses it. 2022-04-08 17:50:49 +02:00
Sebastian Lenzlinger
709e5323e8 actually call method when LISTL is recieved. 2022-04-08 17:24:20 +02:00
Sebastian Lenzlinger
6297439c3c finnished listAllLobbiesToClient() 2022-04-08 17:21:13 +02:00
Sebastian Lenzlinger
922561d522 added getIdAndAdminForList() method in Lobby to facilitate sending a list of lobbies to a client 2022-04-08 17:09:17 +02:00
Sebastian Lenzlinger
f910775f96 listAllLobbies() method started 2022-04-08 16:59:48 +02:00
Sebastian Lenzlinger
372a02a093 synchronized addPlayer() in Lobby.addPlayer 2022-04-08 16:54:57 +02:00
Sebastian Lenzlinger
37a8caa64d Imlemented creating a lobby in the ClientHandler. Added getLobbyID() method to Lobby.java 2022-04-08 16:50:26 +02:00
Sebastian Lenzlinger
8ea39356f2 synchronized adding to shared resources 2022-04-08 16:42:04 +02:00
Sebastian Lenzlinger
b0ebbc9c77 Extending CentralServerData to enable lobby creation and joining 2022-04-08 16:34:25 +02:00
Sebastian Lenzlinger
4557b4801b Client chatListener now throws an IO exception of the chatMSg from the server is null. 2022-04-08 16:15:04 +02:00
Sebastian Lenzlinger
968cb94f21 Now the client disconnects if: 
1. no pingback recieved
2. isConnected has already been set to false
In this case it looks to be a case where the client isn't responding correctly and the server may close the connection. Added a debog log statement at the respective place.
 2022-04-08 16:12:19 +02:00
Sebastian Lenzlinger
f57889431d minor change to addPlayer() method 2022-04-08 15:45:35 +02:00
sebaschi
e86a09e9a8 Completed "else{}" part in addPlayer() method. If the lobby is full a msg is sent to client stating to join a different lobby a creat a new game. Added todo about the servers response. 2022-04-08 15:14:15 +02:00
sebaschi
15d6474765 ""/l" command added to MessageFormatter.java to represent LISTL protocol command. 2022-04-08 14:57:56 +02:00
sebaschi
13ac486624 Added TODO in Protocol.java: Add the servers reaction to LISTL 2022-04-08 14:53:52 +02:00
sebaschi
be2c8d6698 Added LISTL command to Protocol.java and in JServerProtocolParser.java. currently it is only logged THAt it was reached and parsed, but no functionality is attached. 2022-04-08 14:51:31 +02:00
sebaschi
ae61da0607 LISTL command added to Protocol.txt. LISTL shall list all lobbies. 2022-04-08 14:43:45 +02:00
sebaschi
79ddbaf416 Added link referenc in documentation from JServerProtocolParserto Clienthandler. Added LoginClient class for possible implementation of a login sequence. 2022-04-08 14:37:30 +02:00
sebaschi
dd2beb559a Added CRTGM debug logger to JServerProtocolParser to see if command is reached. added "/g" as terminal command for client to issue CRTGM command. remobed respective todos from Protocol.java. 2022-04-08 14:16:40 +02:00
sebaschi
e2a400d0ca added CRTGM command to Protocol.java. and respective todos. 2022-04-08 14:03:40 +02:00
sebaschi
0e8750c985 Updated diary.txt for Sebastian 8.4.22. Started to handle case in Lobby if lobby is full. 2022-04-08 13:34:30 +02:00
sebaschi
22d356e361 Merge branch 'master' of ssh://git.scicore.unibas.ch:2222/cs108-fs22/Gruppe-8 2022-04-08 13:05:44 +02:00
Jonas
c3096d7088 Merge remote-tracking branch 'origin/master' 2022-04-08 13:03:41 +02:00
Jonas
e348840169 protocol is now fully in the protocol.java class 2022-04-08 13:03:32 +02:00
Seraina
ea0c0d1b3b Merge remote-tracking branch 'origin/master' 2022-04-08 13:01:10 +02:00
Seraina
dffd1731e2 Added Doc for print Method 2022-04-08 13:00:47 +02:00
sebaschi
8f453fb9e8 started adding Debug Logger messages to the Lobby methods. 2022-04-08 12:57:36 +02:00
sebaschi
d0ceb6b6f9 Merge remote-tracking branch 'origin/master' 2022-04-08 12:47:26 +02:00
sebaschi
ac022e1f7c Changed the list in ServerLobby to static, since they are global per running server. 2022-04-08 12:47:19 +02:00
Seraina
f729a62289 Merge remote-tracking branch 'origin/master' 2022-04-08 12:46:18 +02:00
Seraina
c134de8bba Removed static from Methods 2022-04-08 12:45:57 +02:00
sebaschi
9cc7a37eb9 ServerLobby now has a list of open lobbies and a list of all clients on the server. 2022-04-08 12:43:36 +02:00
Seraina
33d8f779a2 Merge remote-tracking branch 'origin/master' 2022-04-08 12:42:25 +02:00
Seraina
4337583de6 Fixed some bugs now the VoteHanlder does what it is supposed to 2022-04-08 12:42:02 +02:00
sebaschi
16e6364cc9 Lobby now have static field to count how many lobbies there are in total which is used to assign a particular lobby and ID, so players can ask to join the lobby. 2022-04-08 12:40:11 +02:00