Fix bug where it is possible for multiple KillEvents to be generated …

…for the same entity killed.
cs3217-2324 · Apr 21, 2024 · 34e5e96 · 34e5e96
1 parent 719312f
commit 34e5e96
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/TowerForge/TowerForge/GameModule/Entities/EntityManager.swift b/TowerForge/TowerForge/GameModule/Entities/EntityManager.swift
@@ -35,14 +35,15 @@ class EntityManager {
         /// assert(checkRepresentation())
     }
 
-    func removeEntity(with id: UUID) {
+    func removeEntity(with id: UUID) -> Bool {
         guard let entity = entitiesMap.removeValue(forKey: id) else {
-            return
+            return false
         }
 
         for (key, _) in entity.components {
             componentsMap[key]?.removeValue(forKey: entity.id)
         }
+        return true
         /// assert(checkRepresentation())
     }
 

diff --git a/TowerForge/TowerForge/GameModule/Events/GameEvents/KillEvent.swift b/TowerForge/TowerForge/GameModule/Events/GameEvents/KillEvent.swift
@@ -19,9 +19,13 @@ struct KillEvent: TFEvent {
     }
 
     func execute(in target: any EventTarget) -> EventOutput {
+        var success = false
         if let removeSystem = target.system(ofType: RemoveSystem.self) {
-            removeSystem.handleRemove(for: entityId)
+            success = removeSystem.handleRemove(for: entityId)
+        }
 
+        guard success else {
+            return EventOutput()
         }
 
         if let statsSystem = target.system(ofType: StatisticSystem.self) {

diff --git a/TowerForge/TowerForge/GameModule/Systems/GameSystems/HealthSystem.swift b/TowerForge/TowerForge/GameModule/Systems/GameSystems/HealthSystem.swift
@@ -25,16 +25,21 @@ class HealthSystem: TFSystem {
             return
         }
 
+        // Only handle DamageEvents when the entity taking damage is not already waiting to removed
+        guard healthComponent.currentHealth > 0 else {
+            return
+        }
+
         healthComponent.adjustHealth(amount: hp)
 
         guard healthComponent.currentHealth <= 0 else {
             return
         }
 
         if eventManager.isHost {
-            let remoteRemoveEvent = RemoteKillEvent(id: entityId, player: playerComponent.player,
-                                                    source: eventManager.currentPlayer ?? .defaultPlayer)
-            eventManager.add(remoteRemoveEvent)
+            let remoteKillEvent = RemoteKillEvent(id: entityId, player: playerComponent.player,
+                                                  source: eventManager.currentPlayer ?? .defaultPlayer)
+            eventManager.add(remoteKillEvent)
         }
     }
 }
diff --git a/TowerForge/TowerForge/GameModule/Systems/GameSystems/RemoveSystem.swift b/TowerForge/TowerForge/GameModule/Systems/GameSystems/RemoveSystem.swift
@@ -12,7 +12,7 @@ class RemoveSystem: TFSystem {
 
     /// Removes the provided entity
     /// - Parameter entityId: The UUID of the associated TFEntity to be removed
-    func handleRemove(for entityId: UUID) {
+    func handleRemove(for entityId: UUID) -> Bool {
         entityManager.removeEntity(with: entityId)
     }
 }