From 6a5ebda9fb26804350ccee17c0fa034b99324ec3 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Tue, 13 Feb 2018 12:49:55 -0500
Subject: [PATCH] Change if statement to better handle objects; move options
 dict before at_msg_receive call to allow channels to be known in hook

---
 evennia/comms/models.py    | 4 +---
 evennia/objects/objects.py | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index c456a6e72c..1123e4e5b6 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -585,9 +585,7 @@ class SubscriptionHandler(object):
         for obj in self.all():
             from django.core.exceptions import ObjectDoesNotExist
             try:
-                if hasattr(obj, 'account'):
-                    if not obj.account:
-                        continue
+                if hasattr(obj, 'account') and obj.account:
                     obj = obj.account
                 if not obj.is_connected:
                     continue
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 9e4d8d588a..5572ef26e2 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -553,6 +553,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
                     obj.at_msg_send(text=text, to_obj=self, **kwargs)
                 except Exception:
                     logger.log_trace()
+        kwargs["options"] = options
         try:
             if not self.at_msg_receive(text=text, **kwargs):
                 # if at_msg_receive returns false, we abort message to this object
@@ -560,7 +561,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         except Exception:
             logger.log_trace()
 
-        kwargs["options"] = options
 
         if text and not (isinstance(text, basestring) or isinstance(text, tuple)):
             # sanitize text before sending across the wire