From a00e6071915a1d4a5896468ef7ecdb415b4619b6 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Tue, 13 Feb 2018 12:49:55 -0500
Subject: [PATCH 1/2] 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 b1a5a37ed9..c358cf352b 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -584,9 +584,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 5531b7f856..b55cd0962f 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -519,6 +519,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
@@ -526,7 +527,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

From 2f158909967957d76a84eec4e38a2a88344b61f8 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Tue, 13 Feb 2018 12:54:03 -0500
Subject: [PATCH 2/2] add in is_connected property to base objects

---
 evennia/objects/objects.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index b55cd0962f..d4ce390977 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -206,6 +206,14 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
     def sessions(self):
         return ObjectSessionHandler(self)
 
+    @property
+    def is_connected(self):
+        # we get an error for objects subscribed to channels without this
+        if self.account: # seems sane to pass on the account
+            return self.account.is_connected
+        else:
+            return False
+
     @property
     def has_account(self):
         """