Fixed an critical issue

Author: TitanEch0

scarecrow/src/Entities/EntityLittleScareCrow.cs

@@ -37,6 +37,8 @@ public void Event_EntitySpawn(Entity entity)
         if (
             entity.IsCreature
             && !entity.Code.Path.StartsWith("strawdummy")
+            && !entity.Code.Path.StartsWith("scarecrow")
+            && !entity.Code.Path.StartsWith("little-scarecrow")
             && !entity.Code.Path.StartsWith("villager-")
             && !entity.Code.Path.StartsWith("armorstand")
 
@@ -119,12 +121,6 @@ public override void OnInteract(EntityAgent byEntity, ItemSlot slot, Vec3d hitPo
                 byEntity.World.SpawnItemEntity(itemStack, ServerPos.XYZ, null);
             }
 
-            if (Api.Side == EnumAppSide.Server)
-            {
-                sapi.Event.OnTrySpawnEntity -= SpawnInterceptor;
-                sapi.Event.OnEntitySpawn -= Event_EntitySpawn;
-            }
-
             byEntity.World.Logger.Audit("{0} Took 1x {1} at {2}.",
                 byEntity.GetName(),
                 itemStack.Collectible.Code,
@@ -165,4 +161,14 @@ public override WorldInteraction[] GetInteractionHelp(IClientWorldAccessor world
         });
         return interactions.Append(base.GetInteractionHelp(world, es, player));
     }
+
+    public override void Die(EnumDespawnReason reason = EnumDespawnReason.Death, DamageSource damageSource = null)
+    {
+        base.Die(reason, damageSource);
+        if (sapi != null)
+        {
+            sapi.Event.OnTrySpawnEntity -= SpawnInterceptor;
+            sapi.Event.OnEntitySpawn -= Event_EntitySpawn;
+        }
+    }
 }

scarecrow/src/Entities/EntitySC_StrawDummy.cs

@@ -38,6 +38,8 @@ private void Event_EntitySpawn(Entity entity)
         if (
             entity.IsCreature
             && !entity.Code.Path.StartsWith("strawdummy")
+            && !entity.Code.Path.StartsWith("scarecrow")
+            && !entity.Code.Path.StartsWith("little-scarecrow")
             && !entity.Code.Path.StartsWith("villager-")
             && !entity.Code.Path.StartsWith("armorstand")
 
@@ -120,12 +122,6 @@ public override void OnInteract(EntityAgent byEntity, ItemSlot slot, Vec3d hitPo
                 byEntity.World.SpawnItemEntity(itemStack, ServerPos.XYZ, null);
             }
 
-            if (Api.Side == EnumAppSide.Server)
-            {
-                sapi.Event.OnTrySpawnEntity -= SpawnInterceptor;
-                sapi.Event.OnEntitySpawn -= Event_EntitySpawn;
-            }
-
             byEntity.World.Logger.Audit("{0} Took 1x {1} at {2}.",
                 byEntity.GetName(),
                 itemStack.Collectible.Code,
@@ -166,4 +162,14 @@ public override WorldInteraction[] GetInteractionHelp(IClientWorldAccessor world
         });
         return interactions.Append(base.GetInteractionHelp(world, es, player));
     }
+
+    public override void Die(EnumDespawnReason reason = EnumDespawnReason.Death, DamageSource damageSource = null)
+    {
+        base.Die(reason, damageSource);
+        if (sapi != null)
+        {
+            sapi.Event.OnTrySpawnEntity -= SpawnInterceptor;
+            sapi.Event.OnEntitySpawn -= Event_EntitySpawn;
+        }
+    }
 }

scarecrow/src/Entities/EntityScareCrow.cs

@@ -37,6 +37,8 @@ private void Event_EntitySpawn(Entity entity)
         if (
             entity.IsCreature
             && !entity.Code.Path.StartsWith("strawdummy")
+            && !entity.Code.Path.StartsWith("scarecrow")
+            && !entity.Code.Path.StartsWith("little-scarecrow")
             && !entity.Code.Path.StartsWith("villager-")
             && !entity.Code.Path.StartsWith("armorstand")
 
@@ -119,12 +121,6 @@ public override void OnInteract(EntityAgent byEntity, ItemSlot slot, Vec3d hitPo
                 byEntity.World.SpawnItemEntity(itemStack, ServerPos.XYZ, null);
             }
 
-            if (Api.Side == EnumAppSide.Server)
-            {
-                sapi.Event.OnTrySpawnEntity -= SpawnInterceptor;
-                sapi.Event.OnEntitySpawn -= Event_EntitySpawn;
-            }
-
             byEntity.World.Logger.Audit("{0} Took 1x {1} at {2}.",
                 byEntity.GetName(),
                 itemStack.Collectible.Code,
@@ -165,4 +161,14 @@ public override WorldInteraction[] GetInteractionHelp(IClientWorldAccessor world
         });
         return interactions.Append(base.GetInteractionHelp(world, es, player));
     }
+
+    public override void Die(EnumDespawnReason reason = EnumDespawnReason.Death, DamageSource damageSource = null)
+    {
+        base.Die(reason, damageSource);
+        if (sapi != null)
+        {
+            sapi.Event.OnTrySpawnEntity -= SpawnInterceptor;
+            sapi.Event.OnEntitySpawn -= Event_EntitySpawn;
+        }
+    }
 }