Remove entity modifiers when removing GameplaySpinners

osudroid · Feb 6, 2025 · 541d36a · 541d36a
1 parent 7366ae7
commit 541d36a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/ru/nsu/ccfit/zuev/osu/game/GameplayModernSpinner.java b/src/ru/nsu/ccfit/zuev/osu/game/GameplayModernSpinner.java
@@ -240,12 +240,21 @@ public void update(float dt) {
 
     @Override
     public void removeFromScene() {
-        glow.clearEntityModifiers();
+        middle.clearEntityModifiers();
         scene.detachChild(middle);
+
+        middle2.clearEntityModifiers();
         scene.detachChild(middle2);
+
+        bottom.clearEntityModifiers();
         scene.detachChild(bottom);
+
+        top.clearEntityModifiers();
         scene.detachChild(top);
+
+        glow.clearEntityModifiers();
         scene.detachChild(glow);
+
         scene.detachChild(bonusScore);
 
         listener.removeObject(GameplayModernSpinner.this);

diff --git a/src/ru/nsu/ccfit/zuev/osu/game/GameplaySpinner.java b/src/ru/nsu/ccfit/zuev/osu/game/GameplaySpinner.java
@@ -181,12 +181,25 @@ public void init(final GameObjectListener listener, final Scene scene,
     }
 
     void removeFromScene() {
+        clearText.clearEntityModifiers();
         scene.detachChild(clearText);
+
+        spinText.clearEntityModifiers();
         scene.detachChild(spinText);
+
+        background.clearEntityModifiers();
         scene.detachChild(background);
+
+        approachCircle.clearEntityModifiers();
         approachCircle.detachSelf();
+
+        circle.clearEntityModifiers();
         scene.detachChild(circle);
+
+        metre.clearEntityModifiers();
         scene.detachChild(metre);
+
+
         scene.detachChild(bonusScore);
 
         listener.removeObject(GameplaySpinner.this);