Short circuit remove() when invoked during remove() (see iron spellbooks); for #1705

Author: InitAuther97

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java

@@ -7,6 +7,7 @@
 import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge;
 import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge;
 import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge;
+import io.izzel.arclight.common.mod.server.ArclightServer;
 import io.izzel.arclight.common.mod.util.EntityDamageResult;
 import io.izzel.arclight.common.util.IteratorUtil;
 import io.izzel.arclight.i18n.ArclightConfig;
@@ -391,6 +392,24 @@ public MobEffectInstance removeEffectNoUpdate(@Nullable Holder<MobEffect> holder
         }
     }
 
+    // Fix entity removing itself when effect is removed causes looping remove
+    @Unique private boolean removing = false;
+
+    @Inject(method = "remove", cancellable = true, at = @At("HEAD"))
+    private void arclight$beginOnDeathMobEffects(Entity.RemovalReason removalReason, CallbackInfo ci) {
+        if (removing) {
+            ci.cancel();
+            ArclightServer.LOGGER.warn("remove() is called recursively, skipping");
+            return;
+        }
+        removing = true;
+    }
+
+    @Inject(method = "remove", at = @At("TAIL"))
+    private void arclight$endOnDeathMobEffects(CallbackInfo ci) {
+        removing = false;
+    }
+
     @Inject(method = "triggerOnDeathMobEffects", at = @At(value = "INVOKE", remap = false, target = "Ljava/util/Map;clear()V"))
     private void arclight$fireRemoveEvents(Entity.RemovalReason removalReason, CallbackInfo ci) {
         this.removeAllEffects(EntityPotionEffectEvent.Cause.DEATH);