From 632ff28e475e67dafcabab1715f37456b491c024 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Mon, 25 Mar 2019 14:07:31 +0100 Subject: [PATCH] Improve hasLost detection --- Projektgruppe_175/src/game/goals/CaptureTheFlagGoal.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Projektgruppe_175/src/game/goals/CaptureTheFlagGoal.java b/Projektgruppe_175/src/game/goals/CaptureTheFlagGoal.java index 85f5d1e..6c86646 100644 --- a/Projektgruppe_175/src/game/goals/CaptureTheFlagGoal.java +++ b/Projektgruppe_175/src/game/goals/CaptureTheFlagGoal.java @@ -91,9 +91,12 @@ public class CaptureTheFlagGoal extends Goal { @Override public boolean hasLost(Player player) { - if (isCompleted()) - return player.equals(getWinner()); - + if (this.getGame().getRound() >= MIN_ROUND_FOR_WIN) { + if (isCompleted()) + return player.equals(getWinner()); + return player.getNumRegions(getGame()) < 1; + } + return false; }