1 files changed, 2 insertions, 0 deletions

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 6e7f8c4..0512510 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -289,6 +289,8 @@ public final class GameState {
      * @return the highest priority player
      */
     private PlayerID resolveConflict(List<PlayerID> claimants) {
+        if (claimants == null || claimants.isEmpty()) throw new IllegalArgumentException();
+
         return this.currentPlayerPriorityOrder()
                 .stream()
                 .filter(claimants::contains)