Fixed issues with BaseEntity and PlayerEntity along with fixing inheritance of PlayerEntity

Author: satoon101

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

@@ -23,10 +23,6 @@
 class BaseEntity(object):
     '''Class used to interact directly with entities'''
 
-    index = 0
-    edict = 0
-    _entities = None
-
     def __new__(cls, index, *entities):
         '''Override the __new__ class method to verify the given index
             is of the correct entity type and add the index attribute'''
@@ -45,8 +41,8 @@ def __new__(cls, index, *entities):
         self = object.__new__(cls)
 
         # Set the entity's base attributes
-        self.index = index
-        self.edict = edict
+        self._index = index
+        self._edict = edict
         self._entities = frozenset(list(entities) + ['entity'])
 
         # Return the instance
@@ -64,13 +60,6 @@ def __getattr__(self, attr):
                 # Return the instance's value for the given attribute
                 return getattr(instance, attr)
 
-        # Is this an inherited class and does
-        # the inheriting class have the property?
-        if self.__class__ != BaseEntity and hasattr(self.__class__, attr):
-
-            # Get the attribute
-            return getattr(self.__class__, attr).fget(self)
-
         # Is the attribute a property of this entity?
         if attr in self.properties:
 
@@ -162,23 +151,25 @@ def _get_function(self, item):
     def __setattr__(self, attr, value):
         '''Finds if the attribute is value and sets its value'''
 
-        # Does the class have the given attribute?
-        if hasattr(self.__class__, attr):
+        # Is the given attribute private?
+        if attr.startswith('_'):
 
-            # Is this an inherited class?
-            if self.__class__ != BaseEntity:
+            # Get the name of the private attribute
+            name = attr[1:]
 
-                # Get the attribute and set its value
-                getattr(self.__class__, attr).fset(self, value)
+            # Is the attribute a property?
+            if (name in dir(self) and isinstance(
+                    getattr(self.__class__, name), property)):
+
+                # Set the private attribute's value
+                super(BaseEntity, self).__setattr__(attr, value)
 
                 # No need to go further
                 return
 
-            # Set the attribute
-            object.__setattr__(self, attr, value)
-
-            # No need to go further
-            return
+            # If not a property, do not allow the private attribute
+            raise ValueError(
+                'Invalid private attribute "{0}" given.'.format(attr))
 
         # Loop through all instances
         # (used to set using edict/IPlayerInfo attributes)
@@ -327,6 +318,21 @@ def set_color(self, args):
     # Set the "color" property for BaseEntity
     color = property(get_color, set_color)
 
+    @property
+    def index(self):
+        '''Returns the entity's index'''
+        return self._index
+
+    @property
+    def edict(self):
+        '''Returns the entity's edict instance'''
+        return self._edict
+
+    @property
+    def entities(self):
+        '''Returns the set of entity names to use for the instance'''
+        return self._entities
+
     @property
     def instances(self):
         '''Yields the entity's edict instance'''
@@ -356,19 +362,19 @@ def pointer(self):
     @property
     def properties(self):
         '''Returns all properties for all entities'''
-        return Properties.get_entity_properties(self._entities)
+        return Properties.get_entity_properties(self.entities)
 
     @property
     def keyvalues(self):
         '''Returns all keyvalues for all entities'''
-        return KeyValues.get_entity_keyvalues(self._entities)
+        return KeyValues.get_entity_keyvalues(self.entities)
 
     @property
     def offsets(self):
         '''Returns all offsets for all entities'''
-        return Offsets.get_entity_offsets(self._entities)
+        return Offsets.get_entity_offsets(self.entities)
 
     @property
     def functions(self):
         '''Returns all dynamic calling functions for all entities'''
-        return Functions.get_entity_functions(self._entities)
+        return Functions.get_entity_functions(self.entities)

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

@@ -22,14 +22,12 @@
 class PlayerEntity(BaseEntity, _PlayerWeapons):
     '''Class used to interact directly with players'''
 
-    info = None
-
     def __init__(self, index):
         '''Override the __init__ method to set the
             "entities" attribute and set the PlayerInfo'''
 
         # Set the player's info attribute
-        self.info = CPlayerInfo(self.edict)
+        self._info = CPlayerInfo(self.edict)
 
         # Is the IPlayerInfo instance valid?
         if self.info is None:
@@ -40,6 +38,11 @@ def __init__(self, index):
         # Set the entities attribute
         self._entities = frozenset(['entity', 'player'])
 
+    @property
+    def info(self):
+        '''Returns the player's IPlayerInfo instance'''
+        return self._info
+
     @property
     def instances(self):
         '''Yields the player's IPlayerInfo and Edict instances'''