TraceFilterSimple now accept an iterable of BaseEntity instances instead of indexes as ignored entities (fix for non-networkable entity and Entity.is_in_solid raising).

Author: L'In20Cible

addons/source-python/packages/source-python/engines/trace.py

@@ -11,7 +11,7 @@
 
 # Source.Python Imports
 #   Entities
-from entities.helpers import inthandle_from_index
+from entities.helpers import inthandle_from_baseentity
 
 
 # =============================================================================
@@ -202,7 +202,7 @@ def __init__(self, ignore=(), trace_type=TraceType.EVERYTHING):
         """
         super().__init__()
         self.trace_type = trace_type
-        self.ignore = tuple(map(inthandle_from_index, ignore))
+        self.ignore = tuple(map(inthandle_from_baseentity, ignore))
 
     def should_hit_entity(self, entity, mask):
         """Called when a trace is about to hit an entity.

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

@@ -625,7 +625,7 @@ def is_in_solid(
 
         # Do the trace
         engine_trace.trace_ray(ray, mask, TraceFilterSimple(
-            [entity.index for entity in generator()]), trace)
+            generator()), trace)
 
         # Return whether or not the trace did hit
         return trace.did_hit()

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

@@ -241,7 +241,7 @@ def get_trace_ray(self, mask=ContentMasks.ALL, trace_filter=None):
         # Start the trace
         engine_trace.trace_ray(
             Ray(start_vec, end_vec), mask, TraceFilterSimple(
-                (self.index,)) if trace_filter is None else trace_filter,
+                (self,)) if trace_filter is None else trace_filter,
             trace
         )