From d3a441911413ec851ec8212745ea534bf192993a Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Mon, 20 Apr 2020 16:53:43 +0200 Subject: [PATCH] Fikset bug med registrering av flagg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flyttet hvor vi oppdaterer om en robot har vært på et flagg denne runden --- src/main/java/inf112/fiasko/roborally/objects/Board.java | 1 + src/main/java/inf112/fiasko/roborally/objects/Phase.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index d020a25..1b81fac 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -423,6 +423,7 @@ public class Board { int flagNr = flagID.getTileTypeID() % 16; if (flagNr - 1 == robot.getLastFlagVisited()) { robot.setLastFlagVisitedAndUpdateBackupPosition(flagNr); + setHasTouchedFlagThisTurnFromRobotID(robotID, true); } } diff --git a/src/main/java/inf112/fiasko/roborally/objects/Phase.java b/src/main/java/inf112/fiasko/roborally/objects/Phase.java index e111878..9d490b6 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Phase.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Phase.java @@ -73,7 +73,6 @@ public class Phase { continue; } gameBoard.updateFlagOnRobot(robotID, flag.getElement().getTileType()); - gameBoard.setHasTouchedFlagThisTurnFromRobotID(robotID, true); checkIfPlayerWon(robotID, flags.size()); } }