fix(server): handle empty PlayerSlots

Author: xeruf

sdk/src/main/server-api/sc/framework/plugins/Player.kt

@@ -64,11 +64,8 @@ class Player @JvmOverloads constructor(
         this.listeners.remove(listener)
     }
 
-    fun notifyListeners(o: RoomMessage) {
-        for (listener in ArrayList(listeners)) {
-            listener.onPlayerEvent(o)
-        }
-    }
+    fun notifyListeners(o: RoomMessage) =
+        ArrayList(listeners).forEach { it.onPlayerEvent(o) }
 
     fun requestMove() {
         val request = MoveRequest()

sdk/src/main/server-api/sc/networking/clients/XStreamClient.java

@@ -49,6 +49,7 @@ public enum DisconnectCause {
     PROTOCOL_ERROR,
     LOST_CONNECTION,
     TIMEOUT,
+    NOT_CONNECTED,
     UNKNOWN
   }
 

server/src/main/java/sc/server/gaming/GameRoom.java

@@ -75,7 +75,7 @@ public synchronized void onGameOver(Map<Player, PlayerScore> results) {
       saveReplayMessage(result);
       broadcast(result);
     } catch (Throwable t) {
-      logger.error("Failed to generate GameResult from " + results, t);
+      logger.error("Failed to broadcast GameResult from " + results, t);
     }
 
     saveReplay();
@@ -123,7 +123,7 @@ private void broadcast(ObservableRoomMessage message) {
 
   /** Send ProtocolMessage to all listeners. */
   private void broadcast(ProtocolPacket packet) {
-    playerSlots.forEach(slot -> slot.getClient().send(packet));
+    playerSlots.forEach(slot -> slot.sendPacket(packet));
     observers.forEach(observer -> observer.send(packet));
   }
 
@@ -161,7 +161,7 @@ public void onClientError(ErrorMessage errorPacket) {
   /** Sends the given GameState to all Players. */
   private void sendStateToPlayers(IGameState data) {
     playerSlots.forEach(slot ->
-        slot.getClient().send(createRoomPacket(new MementoMessage(data, slot.getPlayer()))));
+        slot.onPlayerEvent(new MementoMessage(data, slot.getPlayer())));
   }
 
 
@@ -226,9 +226,9 @@ private void startIfReady() {
   }
 
   private synchronized void start() {
+    logger.info("Starting {}", game);
     this.game.start();
     setStatus(GameStatus.ACTIVE);
-    logger.info("Started {}", game);
   }
 
   /** Get the number of players allowed in the game. */
@@ -313,7 +313,7 @@ private Player resolvePlayer(Client client) throws GameRoomException {
   }
 
   /** Get Server {@link IClient Clients} of all {@link PlayerSlot Players}. */
-  public Collection<IClient> getClients() {
+  public Collection<Object> getClients() {
     return playerSlots.stream()
         .filter(p -> !p.isEmpty())
         .map(PlayerSlot::getClient)
@@ -364,7 +364,7 @@ public synchronized void pause(boolean pause) {
    *               conditions are not met. This should result in a GameOver.
    */
   public synchronized void step(boolean forced) {
-    if (this.status == GameStatus.CREATED) {
+    if (getStatus() == GameStatus.CREATED) {
       if (forced) {
         logger.warn("Forcing game start for {}", game);
         start();
@@ -378,7 +378,7 @@ public synchronized void step(boolean forced) {
 
   /** Kick all players, destroy the game and remove it from the manager. */
   public void cancel() {
-    // this will invoked onGameOver and thus stop everything else
+    // this will invoke onGameOver and thus stop everything else
     this.game.stop();
   }
 

server/src/main/java/sc/server/gaming/PlayerSlot.java

@@ -5,6 +5,7 @@
 import sc.framework.plugins.Player;
 import sc.networking.clients.IClient;
 import sc.networking.clients.XStreamClient;
+import sc.protocol.ProtocolPacket;
 import sc.protocol.room.RoomMessage;
 import sc.server.network.Client;
 import sc.server.network.IClientListener;
@@ -72,17 +73,25 @@ public synchronized void free() {
     this.reserved = false;
   }
 
-  public IClient getClient() {
+  public Object getClient() {
     return this.client;
   }
 
   public Player getPlayer() {
     return player;
   }
 
+  public void sendPacket(ProtocolPacket packet) {
+    if(client != null) {
+      client.send(packet);
+    } else {
+      onClientDisconnected(null, XStreamClient.DisconnectCause.NOT_CONNECTED);
+    }
+  }
+
   @Override
   public void onPlayerEvent(RoomMessage message) {
-    client.send(getRoom().createRoomPacket(message));
+    sendPacket(getRoom().createRoomPacket(message));
   }
 
   @Override