The merge went well!!

Tags: #story[1109]
2026-05-09 06:18:44 +00:00 · 2017-08-16 14:51:44 +12:00
parent 8fb5ea2223
commit 5843fc9212
4 changed files with 35 additions and 21 deletions
@@ -189,7 +189,7 @@ public class GameState implements Runnable {
            } catch (InterruptedException e) {
                System.out.println("[GameState] interrupted exception");
            }
-            if (currentStage == GameStages.PRE_RACE || curentStage == GameStages.RACING) {
+            if (currentStage == GameStages.PRE_RACE || currentStage == GameStages.RACING) {
                update();
            }

@@ -245,10 +245,6 @@ public class GameState implements Runnable {
                raceFinished = false;
            }
        }
-        for (Yacht yacht : yachts.values()) {
-            yacht.update(timeInterval);
-        }
-    }

        if (raceFinished) {
            currentStage = GameStages.FINISHED;