Merge remote-tracking branch 'origin/master'

core/src/mindustry/entities/comp/StatusComp.java

@@ -73,6 +73,7 @@ abstract class StatusComp implements Posc, Flyingc{
     }
 
     void clearStatuses(){
+        statuses.each(e -> e.effect.onRemoved(self()));
         statuses.clear();
     }
 
@@ -80,6 +81,7 @@ abstract class StatusComp implements Posc, Flyingc{
     void unapply(StatusEffect effect){
         statuses.remove(e -> {
             if(e.effect == effect){
+                e.effect.onRemoved(self());
                 Pools.free(e);
                 return true;
             }
@@ -189,6 +191,10 @@ abstract class StatusComp implements Posc, Flyingc{
             entry.time = Math.max(entry.time - Time.delta, 0);
 
             if(entry.effect == null || (entry.time <= 0 && !entry.effect.permanent)){
+                if(entry.effect != null){
+                    entry.effect.onRemoved(self());
+                }
+
                 Pools.free(entry);
                 index --;
                 statuses.remove(index);