1 files changed, 25 insertions, 5 deletions

diff --git a/src/ch/epfl/xblast/client/Client.java b/src/ch/epfl/xblast/client/Client.java
index 5b331f2..b522312 100644
--- a/src/ch/epfl/xblast/client/Client.java
+++ b/src/ch/epfl/xblast/client/Client.java
@@ -15,10 +15,8 @@ import java.net.SocketAddress;
 import java.net.StandardProtocolFamily;
 import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.*;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Consumer;
 
 /**
@@ -154,6 +152,25 @@ public class Client {
 
     }
 
+    private static PlayerID deserializePlayerID(byte b) {
+        if (b == Server.OBSERVER)
+            return null;
+
+        try {
+            return PlayerID.fromByte(b);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    private static GameState deserializeGameState(List<Byte> b) {
+        try {
+            return GameStateDeserializer.deserialize(b);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
     private final Channel channel;
     private final GUI gui;
 
@@ -193,8 +210,11 @@ public class Client {
     private void updateGameState() {
         List<Byte> serializedGameState = this.channel.receiveGameState(true);
         if (serializedGameState.size() < 1) return;
-        PlayerID player = PlayerID.fromByte(serializedGameState.get(0));
-        GameState gameState = GameStateDeserializer.deserialize(Lists.firstDropped(serializedGameState, 1));
+
+        PlayerID player = deserializePlayerID(serializedGameState.get(0));
+        GameState gameState = deserializeGameState(Lists.firstDropped(serializedGameState, 1));
+        if (Objects.isNull(gameState)) return;
+
         this.gui.setGameState(gameState, player);
     }