From b00e35786877cc8a0c2297afeb6dd0f1204be76c Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 25 Apr 2016 22:54:10 +0200
Subject: [PATCH] Fixed a simple issue if non-text was fed into the msg() call
 from server-side. Resolves #965.

---
 evennia/objects/objects.py | 1 +
 evennia/players/players.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 2bf14937bd..4c41bf86a3 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -501,6 +501,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         except Exception:
             logger.log_trace()
 
+        text = None if text is None else str(text)
         kwargs["options"] = options
 
         # relay to session(s)
diff --git a/evennia/players/players.py b/evennia/players/players.py
index 55a161d54a..3c8969b29b 100644
--- a/evennia/players/players.py
+++ b/evennia/players/players.py
@@ -416,6 +416,7 @@ class DefaultPlayer(with_metaclass(TypeclassBase, PlayerDB)):
         except Exception:
             pass
 
+        text = None if text is None else str(text)
         kwargs["options"] = options
 
         # session relay