From 7fd47eb38604a1cd0938b0bc57b48d33e7a99b11 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 9 Apr 2014 15:31:18 +0200
Subject: [PATCH] Re-fixed the special obj/player wrapper for scripts.

---
 src/scripts/models.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/scripts/models.py b/src/scripts/models.py
index 969d713860..c577618e09 100644
--- a/src/scripts/models.py
+++ b/src/scripts/models.py
@@ -128,9 +128,11 @@ class ScriptDB(TypedObject):
         the db_player or db_obj field, using the same obj
         property name
         """
-        if self.db_player:
-            return _GA(self, "db_player")
-        return _GA(self, "db_obj")
+        obj = _GA(self, "db_player")
+        if not obj:
+            obj = _GA(self, "db_obj")
+        if obj:
+            return obj.typeclass
 
     def __set_obj(self, value):
         """