Make sure to apply changes that may have been done to Protobuf messages wrapped from an abstract pointer (#390/#399).

Author: jordanbriere

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

@@ -184,28 +184,35 @@ def _pre_send_user_message(args):
 
         try:
             buffer = make_object(ProtobufMessage, args[3])
+            wrapped_from_abstract = False
         except RuntimeError:
             # Patch for issue #390 - UserMessage was created by another plugin.
             buffer = ProtobufMessage.from_abstract_pointer(args[3])
+            wrapped_from_abstract = True
 
         protobuf_user_message_hooks.notify(_recipients, buffer)
 
         # No need to do anything behind this if no listener is registered
-        if not user_message_hooks:
-            return
+        if user_message_hooks:
+            try:
+                impl = get_user_message_impl(message_index)
+            except NotImplementedError:
+                impl = None
+
+            if impl is not None:
+                data = impl.read(buffer)
+                user_message_hooks.notify(_recipients, data)
+
+                # Update buffer if data has been changed
+                if data.has_been_changed():
+                    buffer.clear()
+                    impl.write(buffer, data)
+
+        # If we wrapped the buffer from an abstract pointer, make sure to
+        #   apply any changes that may have been made back into the original.
+        if wrapped_from_abstract:
+            buffer.parse_to_abstract_pointer(args[3])
 
-        try:
-            impl = get_user_message_impl(message_index)
-        except NotImplementedError:
-            return
-
-        data = impl.read(buffer)
-        user_message_hooks.notify(_recipients, data)
-
-        # Update buffer if data has been changed
-        if data.has_been_changed():
-            buffer.clear()
-            impl.write(buffer, data)
 
 else:
     @PreHook(get_virtual_function(engine_server, 'UserMessageBegin'))