From d5cadfe8ed1c3903bc050909c6fe94dbdb30acf3 Mon Sep 17 00:00:00 2001
From: maverickdgg <danielcyc38@gmail.com>
Date: Tue, 1 Nov 2022 14:21:43 +0800
Subject: [PATCH] Removed Component event now runs after the component has been
 removed from the sparse set

---
 .../ECS_Base/Managers/SHComponentManager.cpp   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.cpp
index 75a86f37..8a715a49 100644
--- a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.cpp
+++ b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.cpp
@@ -33,19 +33,19 @@ namespace SHADE
 			return;
 		}
 
+    std::vector<SHComponentRemovedEvent> eventVec;
+
 		for (uint32_t i = 0; i < componentSet.Size(); ++i)
 		{
 			SHComponent* comp = (SHComponent*) componentSet.GetElement(i,  EntityHandleGenerator::GetIndex(entityID));
 			if (comp)
 			{
 				comp->OnDestroy();
+        SHComponentRemovedEvent eventData;
+        eventData.eid = entityID;
+        eventData.removedComponentType = i;
+        eventVec.push_back(eventData);
 			}
-      SHComponentRemovedEvent eventData;
-      eventData.eid = entityID;
-      eventData.removedComponentType = i;
-
-      SHEventManager::BroadcastEvent<SHComponentRemovedEvent>(eventData, SH_COMPONENT_REMOVED_EVENT);
-
 		}
 
 
@@ -57,6 +57,12 @@ namespace SHADE
 
 		componentSet.RemoveElements(EntityHandleGenerator::GetIndex(entityID));
 
+    for (auto& eventData : eventVec)
+    {
+      SHEventManager::BroadcastEvent<SHComponentRemovedEvent>(eventData, SH_COMPONENT_REMOVED_EVENT);
+    }
+
+
 		//entityHandle.RemoveHandle(entityID);