Networked entity listeners now pass an Entity instance to the callbac…

…ks rather than an index.

addons/source-python/docs/source-python/source/developing/module_tutorials/listeners.rst

@@ -212,7 +212,7 @@ Called when a networked entity has been created.
     from listeners import OnNetworkedEntityCreated
 
     @OnNetworkedEntityCreated
-    def on_networked_entity_created(index):
+    def on_networked_entity_created(entity):
         pass
 
 
@@ -240,7 +240,7 @@ Called when a networked entity gets deleted.
     from listeners import OnNetworkedEntityDeleted
 
     @OnNetworkedEntityDeleted
-    def on_networked_entity_deleted(index):
+    def on_networked_entity_deleted(entity):
         pass
 
 
@@ -290,7 +290,7 @@ Called before a networked entity has been spawned.
     from listeners import OnNetworkedEntityPreSpawned
 
     @OnNetworkedEntityPreSpawned
-    def on_networked_entity_pre_spawned(index):
+    def on_networked_entity_pre_spawned(entity):
         pass
 
 .. note:: This listener gets only called in Black Mesa: Source.
@@ -320,7 +320,7 @@ Called when a networked entity has been spawned.
     from listeners import OnNetworkedEntitySpawned
 
     @OnNetworkedEntitySpawned
-    def on_networked_entity_spawned(index):
+    def on_networked_entity_spawned(entity):
         pass
 
 

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

@@ -76,15 +76,18 @@ def from_inthandle(self, inthandle):
         """
         return self[index_from_inthandle(inthandle)]
 
-    def on_automatically_removed(self, index):
+    def on_automatically_removed(self, entity):
         """Called when an index is automatically removed."""
 
     def _on_networked_entity_deleted(self, index):
         """Internal networked entity deletion callback.
 
-        :param int index:
-            The index of the networked entity being removed.
+        :param Entity entity:
+            The networked entity being removed.
         """
+        # Get the index of the entity
+        index = entity.index
+
         # No need to go further if there is no object associated to this index
         if index not in self:
             return

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

@@ -220,6 +220,6 @@ def initialize(self, index):
 # >> LISTENERS
 # =============================================================================
 @OnNetworkedEntityCreated
-def on_networked_entity_created(index):
+def on_networked_entity_created(entity):
     """Called when a new networked entity has been created."""
-    _waiting_entity_hooks.initialize(index)
+    _waiting_entity_hooks.initialize(entity.index)

src/core/sp_main.cpp

@@ -609,7 +609,8 @@ void CSourcePython::OnEntityPreSpawned( CBaseEntity *pEntity )
 	if (!IndexFromBaseEntity(pEntity, uiIndex))
 		return;
 
-	CALL_LISTENERS(OnEntityPreSpawned, uiIndex);
+	static object Entity = import("entities").attr("entity").attr("Entity");
+	CALL_LISTENERS(OnEntityPreSpawned, Entity(uiIndex));
 }
 #endif
 
@@ -630,7 +631,8 @@ void CSourcePython::OnEntityCreated( CBaseEntity *pEntity )
 	if (!IndexFromBaseEntity(pEntity, uiIndex))
 		return;
 
-	CALL_LISTENERS(OnNetworkedEntityCreated, uiIndex);
+	static object Entity = import("entities").attr("entity").attr("Entity");
+	CALL_LISTENERS(OnNetworkedEntityCreated, Entity(uiIndex));
 }
 
 void CSourcePython::OnEntitySpawned( CBaseEntity *pEntity )
@@ -641,19 +643,20 @@ void CSourcePython::OnEntitySpawned( CBaseEntity *pEntity )
 	if (!IndexFromBaseEntity(pEntity, uiIndex))
 		return;
 
-	CALL_LISTENERS(OnNetworkedEntitySpawned, uiIndex);
+	static object Entity = import("entities").attr("entity").attr("Entity");
+	CALL_LISTENERS(OnNetworkedEntitySpawned, Entity(uiIndex));
 }
 
 void CSourcePython::OnEntityDeleted( CBaseEntity *pEntity )
 {
-	object oEntity(ptr((CBaseEntityWrapper*) pEntity));
-	CALL_LISTENERS(OnEntityDeleted, oEntity);
+	CALL_LISTENERS(OnEntityDeleted, ptr((CBaseEntityWrapper*) pEntity));
 
 	unsigned int uiIndex;
 	if (!IndexFromBaseEntity(pEntity, uiIndex))
 		return;
 
-	CALL_LISTENERS(OnNetworkedEntityDeleted, uiIndex);
+	static object Entity = import("entities").attr("entity").attr("Entity");
+	CALL_LISTENERS(OnNetworkedEntityDeleted, Entity(uiIndex));
 
 	// Invalidate the internal entity cache once all callbacks have been called.
 	static object _on_networked_entity_deleted = import("entities").attr("_base").attr("_on_networked_entity_deleted");