Fixed entity delays/repeats not being cancelled if they were registered from an OnEntityDeleted listener called after the internal callback.

Author: jordanbriere

addons/source-python/packages/source-python/entities/_base.py

@@ -51,8 +51,6 @@
 #   Filters
 from filters.weapons import WeaponClassIter
 #   Listeners
-from listeners import OnEntityDeleted
-from listeners import on_entity_deleted_listener_manager
 from listeners.tick import Delay
 from listeners.tick import Repeat
 from listeners.tick import RepeatStatus
@@ -168,17 +166,6 @@ def cache(cls):
         """
         return cls._cache
 
-    @staticmethod
-    def _invalidate_cache(base_entity):
-        """Invalidates the cache for the given entity."""
-        try:
-            index = base_entity.index
-        except ValueError:
-            return
-
-        for cls in _entity_classes:
-            cls.cache.pop(index, None)
-
 
 class Entity(BaseEntity, metaclass=_EntityCaching):
     """Class used to interact directly with entities.
@@ -1245,7 +1232,8 @@ def set_parent(self, parent, attachment=INVALID_ATTACHMENT_INDEX):
 # =============================================================================
 # >> LISTENERS
 # =============================================================================
-@OnEntityDeleted
+# NOTE: This callback is called by sp_main.cpp after all registered entity
+#       deletion listeners have been called.
 def _on_entity_deleted(base_entity):
     """Called when an entity is removed.
 
@@ -1258,22 +1246,20 @@ def _on_entity_deleted(base_entity):
     except ValueError:
         return
 
-    # Get the registered delays for this entity
-    delays = _entity_delays.pop(index, ())
-
     # Loop through all delays...
-    for delay in delays:
+    for delay in _entity_delays.pop(index, ()):
 
         # Cancel the delay...
         with suppress(ValueError):
             delay.cancel()
 
-    # Get the registered repeats for this entity
-    repeats = _entity_repeats.pop(index, ())
-
     # Loop through all repeats...
-    for repeat in repeats:
+    for repeat in _entity_repeats.pop(index, ()):
 
         # Stop the repeat if running
         if repeat.status is RepeatStatus.RUNNING:
             repeat.stop()
+
+    # Invalidate the internal entity caches for this entity
+    for cls in _entity_classes:
+        cls.cache.pop(index, None)

src/core/sp_main.cpp

@@ -630,11 +630,12 @@ void CSourcePython::OnEntitySpawned( CBaseEntity *pEntity )
 
 void CSourcePython::OnEntityDeleted( CBaseEntity *pEntity )
 {
-	CALL_LISTENERS(OnEntityDeleted, ptr((CBaseEntityWrapper*) pEntity));
+	object oEntity(ptr((CBaseEntityWrapper*) pEntity));
+	CALL_LISTENERS(OnEntityDeleted, oEntity);
 
 	// Invalidate the internal entity cache once all callbacks have been called.
-	static object oCacheInvalidator = import("entities").attr("_base").attr("_EntityCaching").attr("_invalidate_cache");
-	oCacheInvalidator(ptr((CBaseEntityWrapper*) pEntity));
+	static object _on_entity_deleted = import("entities").attr("_base").attr("_on_entity_deleted");
+	_on_entity_deleted(oEntity);
 }
 
 void CSourcePython::OnDataLoaded( MDLCacheDataType_t type, MDLHandle_t handle )