Merge branch 'master' into cached_property

Author: jordanbriere

addons/source-python/data/source-python/entities/CFuncRotating.ini

@@ -0,0 +1,33 @@
+[input]
+
+    reverse = Reverse
+    set_speed = SetSpeed
+    start = Start
+    start_backward = StartBackward
+    start_forward = StartForward
+    stop = Stop
+    stop_at_start_pos = StopAtStartPos
+    toggle = Toggle
+
+
+[keyvalue]
+    
+    [[fan_friction]]
+        name = fanfriction
+        type = INTEGER
+
+    dmg = dmg
+    message = message
+    solid_bsp = solidbsp
+
+
+[property]
+
+    ang_start = m_angStart
+    attenuation = m_flAttenuation
+    max_speed = m_flMaxSpeed
+    move_ang = m_vecMoveAng
+    reversed = m_bReversed
+    stop_at_start_pos = m_bStopAtStartPos
+    target_speed = m_flTargetSpeed
+    volume = m_flVolume

addons/source-python/data/source-python/entities/CSpriteTrail.ini

@@ -0,0 +1,16 @@
+[keyvalue]
+    
+    animate = animate
+    end_width = endwidth
+    life_time = lifetime
+    sprite_name = spritename
+    start_width = startwidth
+    
+
+[property]
+
+    min_fade_length = m_flMinFadeLength
+    skybox_origin = m_vecSkyboxOrigin
+    skybox_scale = m_flSkyboxScale
+    start_width_variance = m_flStartWidthVariance
+    texture_res = m_flTextureRes

addons/source-python/packages/source-python/core/__init__.py

@@ -35,8 +35,6 @@
 from configobj import ConfigObj
 
 # Source.Python Imports
-#   Loggers
-from loggers import _sp_logger
 #   Paths
 from paths import GAME_PATH
 
@@ -89,9 +87,6 @@
 # Get the platform the server is on
 PLATFORM = system().lower()
 
-# Get the sp.core logger
-core_logger = _sp_logger.core
-
 
 # =============================================================================
 # >> CLASSES

addons/source-python/packages/source-python/core/command/__init__.py

@@ -19,9 +19,9 @@
 #   Commands
 from commands.typed import TypedServerCommand
 #   Core
-from core import core_logger
 from core import create_checksum
 from core import SOURCE_ENGINE_BRANCH
+from core.logger import core_logger
 from core.update import do_full_update
 from core.version import get_last_successful_build_number
 from core.version import is_unversioned

addons/source-python/packages/source-python/core/logger.py

@@ -0,0 +1,17 @@
+# ../core/logger.py
+
+"""Provides the Source.Python core logger."""
+
+# =============================================================================
+# >> IMPORTS
+# =============================================================================
+# Source.Python Imports
+#   Loggers
+from loggers import _sp_logger
+
+
+# =============================================================================
+# >> GLOBAL VARIABLES
+# =============================================================================
+# Get the sp.core logger
+core_logger = _sp_logger.core

addons/source-python/packages/source-python/core/settings.py

@@ -11,7 +11,7 @@
 
 # Source.Python Imports
 #   Core
-from core import core_logger
+from core.logger import core_logger
 #   Paths
 from paths import GAME_PATH
 from paths import CFG_PATH

addons/source-python/packages/source-python/core/update.py

@@ -15,8 +15,8 @@
 # Source.Python Imports
 #   Core
 from core import PLATFORM
-from core import core_logger
 from core import SOURCE_ENGINE_BRANCH
+from core.logger import core_logger
 #   Paths
 from paths import ADDONS_PATH
 from paths import GAME_PATH

addons/source-python/packages/source-python/loggers.py

@@ -20,6 +20,8 @@
 from logging import getLogger
 
 # Source.Python Imports
+#   Core
+from core import AutoUnload
 #   Cvars
 from cvars import ConVar
 #   Paths
@@ -314,7 +316,7 @@ def logger(self):
         return self._logger
 
 
-class LogManager(_LogInstance):
+class LogManager(AutoUnload, _LogInstance):
     """Main log class used as a root to create children instances."""
 
     def __init__(
@@ -388,6 +390,10 @@ def areas(self):
         """
         return self._areas.get_int()
 
+    def _unload_instance(self):
+        """Remove the logger from logging manager."""
+        self.logger.manager.loggerDict.pop(self.logger.name, None)
+
 # Set the core ConVars
 _level = ConVar(
     'sp_logging_level', '0', 'The Source.Python base logging level')

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

@@ -28,6 +28,8 @@
 from listeners import ListenerManager
 #   Memory
 from memory import make_object
+from memory import get_object_pointer
+from memory import get_size
 from memory import get_virtual_function
 from memory.hooks import PreHook
 from memory.hooks import PostHook
@@ -171,9 +173,16 @@ def _pre_send_user_message(args):
         if not user_message_hooks and not protobuf_user_message_hooks:
             return
 
-        # Replace original recipients filter
-        tmp_recipients = make_object(BaseRecipientFilter, args[1])
-        _recipients.update(*tuple(tmp_recipients), clear=True)
+        try:
+            # Replace original recipients filter
+            tmp_recipients = make_object(BaseRecipientFilter, args[1])
+            _recipients.update(*tuple(tmp_recipients), clear=True)
+        except RuntimeError:
+            # Patch for issue #314
+            tmp_recipients = RecipientFilter()
+            (args[1] + 4).copy(get_object_pointer(tmp_recipients) + 4,
+                get_size(RecipientFilter) - 4)
+            _recipients.update(*tuple(tmp_recipients), clear=True)
         args[1] = _recipients
 
         buffer = make_object(ProtobufMessage, args[3])
@@ -200,9 +209,16 @@ def _pre_send_user_message(args):
 else:
     @PreHook(get_virtual_function(engine_server, 'UserMessageBegin'))
     def _pre_user_message_begin(args):
-        # Replace original recipients filter
-        tmp_recipients = make_object(BaseRecipientFilter, args[1])
-        _recipients.update(*tuple(tmp_recipients), clear=True)
+        try:
+            # Replace original recipients filter
+            tmp_recipients = make_object(BaseRecipientFilter, args[1])
+            _recipients.update(*tuple(tmp_recipients), clear=True)
+        except RuntimeError:
+            # Patch for issue #314
+            tmp_recipients = RecipientFilter()
+            (args[1] + 4).copy(get_object_pointer(tmp_recipients) + 4,
+                get_size(RecipientFilter) - 4)
+            _recipients.update(*tuple(tmp_recipients), clear=True)
         args[1] = _recipients
 
     @PostHook(get_virtual_function(engine_server, 'UserMessageBegin'))
@@ -260,4 +276,4 @@ def _pre_message_end(args):
         # Update buffer if data has been changed
         if data.has_been_changed():
             buffer_write.seek_to_bit(0)
-            impl.write(buffer_write, data)
+            impl.write(buffer_write, data)