From 84f9eade07cc2c9e78315a6868abb0a176815643 Mon Sep 17 00:00:00 2001 From: BlairCannon97 Date: Tue, 17 Oct 2023 12:44:09 +1000 Subject: [PATCH] Reverted a change in MainGameScreen where a hostile mob would cause a game crash at the end of their lane --- .../main/com/csse3200/game/screens/MainGameScreen.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/source/core/src/main/com/csse3200/game/screens/MainGameScreen.java b/source/core/src/main/com/csse3200/game/screens/MainGameScreen.java index c1c1459d4..f11a4aa01 100644 --- a/source/core/src/main/com/csse3200/game/screens/MainGameScreen.java +++ b/source/core/src/main/com/csse3200/game/screens/MainGameScreen.java @@ -213,14 +213,11 @@ public void render(float delta) { ServiceLocator.getWaveService().getDisplay().updateMobCount(); renderer.render(); - // Check if the game has ended // Check if the game has ended if (ServiceLocator.getGameEndService().hasGameEnded()) { ui.getEvents().trigger("lose"); - } - - // Check if all waves are completed and the level has been completed - if (ServiceLocator.getWaveService().isLevelCompleted()) { + } else if (ServiceLocator.getWaveService().isLevelCompleted()) { + // Check if all waves are completed and the level has been completed if (selectedLevel == 2) { // Lava level // If it's the lava level, go to the "win" screen ui.getEvents().trigger("win"); @@ -232,7 +229,6 @@ public void render(float delta) { } } } - // Add something in to unlock the next planet/level? @Override public void resize(int width, int height) {