From e9e91d16b15aeee4979f0d00feb23e8d65093027 Mon Sep 17 00:00:00 2001
From: "joshua.linden" <devnull@localhost>
Date: Fri, 5 Jun 2009 22:00:36 +0000
Subject: [PATCH] Fix dipatching of messages. Paired w/ enus.linden

---
 pyogp/lib/base/message/udpdispatcher.py | 6 ++++--
 pyogp/lib/base/parcel.py                | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyogp/lib/base/message/udpdispatcher.py b/pyogp/lib/base/message/udpdispatcher.py
index 99c3585..df2c057 100644
--- a/pyogp/lib/base/message/udpdispatcher.py
+++ b/pyogp/lib/base/message/udpdispatcher.py
@@ -155,8 +155,10 @@ class UDPDispatcher(object):
         if host.is_ok() == False:
             return
 
-        packet = Message(message.name)
-        packet.blocks = message.blocks
+        if isinstance(message,Message):
+            packet = message
+        else:
+            packet = message()
 
         # enable monitoring of outgoing packets
         if self.settings.HANDLE_PACKETS:
diff --git a/pyogp/lib/base/parcel.py b/pyogp/lib/base/parcel.py
index bf7badd..a7c03cb 100644
--- a/pyogp/lib/base/parcel.py
+++ b/pyogp/lib/base/parcel.py
@@ -10,7 +10,7 @@ from pyogp.lib.base.datatypes import UUID
 from pyogp.lib.base.exc import *
 
 # pyogp messaging
-#from pyogp.lib.base.message.packets import *
+from pyogp.lib.base.message.packets import *
 from pyogp.lib.base.message.message_handler import MessageHandler
 
 # utilities