Fixed Entity.__setattr__ not properly iterating over the entity's server classes.

Fixed dynamic function wrappers from no longer being able to access the instance.
Some various improvements to some redundant logics.

Author: jordanbriere

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

@@ -208,13 +208,13 @@ def __setattr__(self, attr, value):
             return
 
         # Loop through all of the entity's server classes
-        for server_class in self.server_classes:
+        for server_class, instance in self.server_classes.items():
 
             # Does the current server class contain the given attribute?
             if hasattr(server_class, attr):
 
                 # Set the attribute's value
-                setattr(server_class(self.pointer, wrap=True), attr, value)
+                setattr(instance, attr, value)
 
                 # No need to go further
                 return
@@ -1219,30 +1219,23 @@ def _on_entity_deleted(base_entity):
     :param BaseEntity base_entity:
         The removed entity.
     """
-    # Make sure the entity is networkable...
-    if not base_entity.is_networked():
+    try:
+        # Get the index of the entity...
+        index = base_entity.index
+    except ValueError:
         return
 
-    # Get the index of the entity...
-    index = base_entity.index
-
     # Cleanup the cache
     for cls in _entity_classes:
         cls.cache.pop(index, None)
 
-    # Was no delay registered for this entity?
-    if index not in _entity_delays:
-        return
-
-    # Loop through all delays...
-    for delay in _entity_delays[index]:
-
-        # Make sure the delay is still running...
-        if not delay.running:
-            continue
+    with suppress(KeyError):
+        # Loop through all delays...
+        for delay in _entity_delays[index]:
 
-        # Cancel the delay...
-        delay.cancel()
+            # Cancel the delay...
+            with suppress(ValueError):
+                delay.cancel()
 
-    # Remove the entity from the dictionary...
-    del _entity_delays[index]
+        # Remove the entity from the dictionary...
+        del _entity_delays[index]

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

@@ -64,14 +64,9 @@ def __missing__(self, index):
 
     def __delitem__(self, index):
         """Remove the given index from the dictionary."""
-        # Is the given index not in the dictionary?
-        if index not in self:
-
-            # If so, no need to go further...
-            return
-
         # Remove the given index from the dictionary...
-        super().__delitem__(index)
+        with suppress(KeyError):
+            super().__delitem__(index)
 
     def from_inthandle(self, inthandle):
         """Get an entity instance from an inthandle.
@@ -87,26 +82,18 @@ def on_automatically_removed(self, index):
 
     def _on_entity_deleted(self, base_entity):
         """OnEntityDeleted listener callback."""
-        # Is the entity networkable?
-        if not base_entity.is_networked():
-
-            # No, so skip it...
-            return
-
-        # Get the index of the entity...
-        index = base_entity.index
-
-        # Is the index not in the dictionary?
-        if index not in self:
-
-            # No need to go further...
+        try:
+            # Get the index of the entity...
+            index = base_entity.index
+        except ValueError:
             return
 
-        # Call the deletion callback for the index...
-        self.on_automatically_removed(index)
+        with suppress(KeyError):
+            # Call the deletion callback for the index...
+            self.on_automatically_removed(index)
 
-        # Remove the index from the dictionary...
-        super().__delitem__(index)
+            # Remove the index from the dictionary...
+            super().__delitem__(index)
 
     def _unload_instance(self):
         """Unregister our OnEntityDeleted listener."""

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

@@ -7,7 +7,7 @@
 # =============================================================================
 # Python Imports
 #   WeakRef
-from weakref import ref
+from weakref import proxy
 
 # Source.Python Imports
 #   Core
@@ -105,7 +105,7 @@ def __init__(self, wrapped_self, wrapper):
         # Don't store a strong reference to the wrapped instance.
         # If we do, we will ends with a circular reference preventing itself,
         # along with everything it refers, to ever be garbage collected.
-        self.wrapped_self = ref(wrapped_self)
+        self.wrapped_self = proxy(wrapped_self)
 
     def __call__(self, *args, **kwargs):
         return super().__call__(