Merge pull request #646 from UQcsse3200/team2_upgrades2

Fixed meter.remove(), text.remove() issue for Main
UQcsse3200 · Oct 16, 2024 · 4898d7a · 4898d7a
2 parents 8402f8a + c03d86b
commit 4898d7a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/upgrades/DancePartyUpgrade.java b/source/core/src/main/com/csse3200/game/components/upgrades/DancePartyUpgrade.java
@@ -162,8 +162,11 @@ public void activate() {
     public void deactivate() {
         isActive = false;
         layout.setVisible(false);
-        meter.remove();
-        text.remove();
+        // Ensure the text and meter are removed from the stage after time finish
+        if (meter != null && meter.hasParent()) {
+            meter.remove();
+            text.remove();
+        }
 
         ServiceLocator.getDocketService().getEvents().trigger("UnDancing");
     }

diff --git a/source/core/src/main/com/csse3200/game/components/upgrades/ExtortionUpgrade.java b/source/core/src/main/com/csse3200/game/components/upgrades/ExtortionUpgrade.java
@@ -144,8 +144,11 @@ public void deactivate() {
         ServiceLocator.getRandomComboService().getEvents().trigger("extortion unactive");
 
 
-        meter.remove();
-        text.remove();
+        // Ensure the text and meter are removed from the stage after time finish
+        if (meter != null && meter.hasParent()) {
+            meter.remove();
+            text.remove();
+        }
     }
 
     /**