From c8dcae06ed2a5b7765bf28ca7ff3d72146a1edcd Mon Sep 17 00:00:00 2001
From: delizin <delizin@gmail.com>
Date: Sun, 9 Feb 2014 20:27:16 -0500
Subject: [PATCH] Revert to master fork changes

---
 src/objects/models.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/objects/models.py b/src/objects/models.py
index e5b1c5355d..0586d9168e 100644
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -714,19 +714,6 @@ class ObjectDB(TypedObject):
 
         self.delete_iter += 1
 
-        # If this is a character, delete it from the player's playable characters list 
-        if _GA(self, 'locks').get("puppet"):
-            # Extract Player id
-            try:
-                pid = _GA(self, "locks").get("puppet")
-                pid = pid[pid.find("pid(")+4:]
-                pid = int(pid[:pid.find(")")])
-            except ValueError:
-                return False
-            players = PlayerDB.objects
-            player = players.get_id(pid)
-            player.db._playable_characters.remove(self)
-
         # See if we need to kick the player off.
 
         for session in _GA(self, "sessions"):