Update templates.py

Made temp entity hooks called in the order they were registered and changed the logic of TempEntityTemplate.handle_hook so that it uses the return value of the last callback to override it (same behavior as the regular memory hooks for consistency).

Author: invincibleqc

addons/source-python/packages/source-python/effects/templates.py

@@ -75,7 +75,7 @@ def __init__(self, temp_entity):
             self._add_properties(prop.data_table)
 
         # Get a dictionary to store our hooks...
-        self._hooks = {HookType.PRE: set(), HookType.POST: set()}
+        self._hooks = {HookType.PRE: list(), HookType.POST: list()}
 
         # Initialize the base class...
         super()._copy_base(temp_entity, self.size)
@@ -182,8 +182,12 @@ def add_hook(self, hook_type, callback):
         if not callable(callback):
             raise TypeError('The given callback is not callable.')
 
+        # Is the callback already registered?
+        if callback in hooks:
+            raise ValueError('The given callback is already registered.')
+
         # Register the hook...
-        self.hooks[hook_type].add(callback)
+        hooks.append(callback)
 
     def remove_hook(self, hook_type, callback):
         """Unregister a hook for this temp entity.
@@ -201,7 +205,7 @@ def remove_hook(self, hook_type, callback):
             raise TypeError('The given hook type is invalid.')
 
         # Unregister the hook...
-        self.hooks[hook_type].discard(callback)
+        hooks.remove(callback)
 
     def handle_hook(self, hook_type, temp_entity, recipient_filter):
         """Call the registered callbacks.
@@ -215,27 +219,23 @@ def handle_hook(self, hook_type, temp_entity, recipient_filter):
 
         :rtype: bool
         """
-        # Flag variable to determine whether or not any callback wants to
-        #   block the original call...
-        block = False
+        # Set the default return value to None...
+        return_value = None
 
         # Loop through all registered hooks for this temp entity...
         for callback in self.hooks[hook_type]:
 
             # Call the callback and store the value it returned...
             ret = callback(temp_entity, recipient_filter)
 
-            # Is the returned value not None and evaluate to False?
-            if ret is not None and not ret:
-
-                # This callback wants to block the original call...
-                block = True
+            # Did the callback return anything?
+            if ret is not None:
 
-        # Does any callback wanted to block the original call?
-        if block:
+                # Yes, so override the return value...
+                return_value = ret
 
-            # Yes, so block it...
-            return False
+        # Return the return value...
+        return return_value
 
     @property
     def aliases(self):