From a4e2744821977aca703d6e140d81ba3104f50b06 Mon Sep 17 00:00:00 2001 From: Eldritch Semblance Date: Wed, 29 Mar 2017 02:46:44 +0000 Subject: [PATCH] check if ooc or puppeting before finding player object --- evennia/contrib/mail.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/evennia/contrib/mail.py b/evennia/contrib/mail.py index a1eb7be1d1..d817b07125 100644 --- a/evennia/contrib/mail.py +++ b/evennia/contrib/mail.py @@ -88,7 +88,11 @@ class CmdMail(default_cmds.MuxCommand): """ # mail_messages = Msg.objects.get_by_tag(category="mail") # messages = [] - messages = Msg.objects.get_by_tag(category="mail", raw_queryset=True).filter(db_receivers_players=self.caller) + try: + player = self.caller.player + except AttributeError: + player = self.caller + messages = Msg.objects.get_by_tag(category="mail", raw_queryset=True).filter(db_receivers_players=player) return messages def send_mail(self, recipients, subject, message, caller):