From 8c2434af5f920d2f550f8c4fce776b163bd5fcd4 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Wed, 25 Oct 2023 10:04:11 -0700
Subject: [PATCH] Fix monsters not disappearing after battle

---
 src/main/java/emu/lunarcore/game/scene/Scene.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/emu/lunarcore/game/scene/Scene.java b/src/main/java/emu/lunarcore/game/scene/Scene.java
index 67eaaf1..8bde187 100644
--- a/src/main/java/emu/lunarcore/game/scene/Scene.java
+++ b/src/main/java/emu/lunarcore/game/scene/Scene.java
@@ -292,11 +292,12 @@ public class Scene {
         GameEntity entity = this.getEntities().remove(entityId);
 
         if (entity != null) {
-            // Reset entity id and run event
-            entity.setEntityId(0);
+            // Run event
             entity.onRemove();
             // Send packet
             player.sendPacket(new PacketSceneGroupRefreshScNotify(null, entity));
+            // Reset entity id
+            entity.setEntityId(0);
         }
     }