From ed00e42762d11f83c8603440f4e3d1c2d1e64dca Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 20 Feb 2012 21:56:11 +0100 Subject: [PATCH] Made check for PlayerObject more rigorous in create.create_msg, in response to issue 209. --- src/utils/create.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/utils/create.py b/src/utils/create.py index f301876aa1..50f18825e0 100644 --- a/src/utils/create.py +++ b/src/utils/create.py @@ -276,14 +276,17 @@ def create_message(senderobj, message, channels=None, desired. """ from src.comms.models import Msg + from src.players.models import PlayerDB from src.comms.managers import to_object def to_player(obj): "Make sure the object is a player object" - if hasattr(obj, 'user'): + if isinstance(obj, PlayerDB): return obj - elif hasattr(obj, 'player'): - return obj.player + elif hasattr(obj, 'user'): + return obj.dbobj + elif hasattr(obj, 'db_player'): + return obj.db_player else: return None