Ensure that objects are actually removed from scene on expiry

Author: Rian8337

src/ru/nsu/ccfit/zuev/osu/game/GameplayHitCircle.java

@@ -308,6 +308,32 @@ public void update(final float dt) {
     public void onExpire() {
         super.onExpire();
 
+        if (scene != null) {
+            if (!startHit) {
+                startHit = true;
+                double mehWindow = beatmapCircle.hitWindow.getMehWindow() / 1000;
+                listener.registerAccuracy(HitObjectType.Normal, mehWindow + 1);
+                listener.onCircleHit(id, 10, position, false, (replayObjectData == null) ? 0 : replayObjectData.result, comboColor);
+            }
+
+            for (int i = hitSamples.size() - 1; i >= 0; --i) {
+                var sample = hitSamples.get(i);
+
+                sample.reset();
+                GameplayHitSampleInfo.pool.free(sample);
+
+                hitSamples.remove(i);
+            }
+
+            scene = null;
+        }
+
+        circlePiece.clearEntityModifiers();
+        approachCircle.clearEntityModifiers();
+
+        circlePiece.detachSelf();
+        approachCircle.detachSelf();
+
         GameObjectPool.getInstance().putCircle(this);
     }
 

src/ru/nsu/ccfit/zuev/osu/game/GameplaySlider.java

@@ -31,7 +31,6 @@
 import com.rian.osu.mods.ModHidden;
 import com.rian.osu.mods.ModSynesthesia;
 
-import org.anddev.andengine.entity.IEntity;
 import org.anddev.andengine.entity.scene.Scene;
 import org.anddev.andengine.util.MathUtils;
 import ru.nsu.ccfit.zuev.osu.Config;
@@ -655,10 +654,33 @@ private void removeFromScene() {
 
     @Override
     public void onExpire() {
+        if (scene != null) {
+            if (!startHit) {
+                double mehWindow = hitWindow.getMehWindow() / 1000;
+                listener.registerAccuracy(HitObjectType.Slider, mehWindow + 1);
+                listener.onSliderHit(id, 10, position, false, bodyColor, GameObjectListener.SLIDER_END, false);
+            }
+
+            stopSlidingSamples();
+
+            for (int i = 0, iSize = nestedHitSamples.size(); i < iSize; ++i) {
+                var hitSamples = nestedHitSamples.get(i);
+
+                for (int j = hitSamples.size() - 1; j >= 0; --j) {
+                    var sample = hitSamples.get(j);
+
+                    sample.reset();
+                    GameplayHitSampleInfo.pool.free(sample);
+
+                    hitSamples.remove(j);
+                }
+            }
+
+            scene = null;
+        }
+
         headCirclePiece.clearEntityModifiers();
         tailCirclePiece.clearEntityModifiers();
-        sliderHeadLateMissFadeModifier = null;
-
         startArrow.clearEntityModifiers();
         endArrow.clearEntityModifiers();
         approachCircle.clearEntityModifiers();
@@ -667,6 +689,18 @@ public void onExpire() {
         sliderBody.clearEntityModifiers();
         tickContainer.clearEntityModifiers();
 
+        headCirclePiece.detachSelf();
+        tailCirclePiece.detachSelf();
+        startArrow.detachSelf();
+        endArrow.detachSelf();
+        approachCircle.detachSelf();
+        followCircle.detachSelf();
+        ball.detachSelf();
+        sliderBody.detachSelf();
+        tickContainer.detachSelf();
+
+        sliderHeadLateMissFadeModifier = null;
+
         GameObjectPool.getInstance().putSlider(this);
     }
 

src/ru/nsu/ccfit/zuev/osu/game/GameplaySpinner.java

@@ -400,6 +400,7 @@ public void update(final float dt) {
     public void onExpire() {
         super.onExpire();
 
+        removeFromScene();
         GameObjectPool.getInstance().putSpinner(this);
     }