From 4e4d8484d44f62ac9551f6afa415cd391ae1d663 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Jan 2015 18:44:21 +0100
Subject: [PATCH] Made sure to re-cache the superuser bypass correctly.

---
 src/objects/models.py | 8 --------
 src/players/player.py | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/objects/models.py b/src/objects/models.py
index 5752c126e8..7bba3fec5e 100644
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -106,14 +106,6 @@ class ObjectDB(TypedObject):
     # Database manager
     objects = ObjectDBManager()
 
-    # field-related field-related properties
-    def _at_db_player_postsave(self):
-        """
-        This hook is called automatically after the player field is saved.
-        """
-        # we need to re-cache this for superusers to bypass.
-        self.locks.cache_lock_bypass(self)
-
     # cmdset_storage property handling
     def __cmdset_storage_get(self):
         "getter"
diff --git a/src/players/player.py b/src/players/player.py
index 4926b2f796..49fd531944 100644
--- a/src/players/player.py
+++ b/src/players/player.py
@@ -199,6 +199,8 @@ class DefaultPlayer(PlayerDB):
         ScriptDB.objects.validate(obj=obj)
         if normal_mode:
             obj.at_post_puppet()
+        # re-cache locks to make sure superuser bypass is updated
+        obj.locks.cache_lock_bypass(obj)
         return True
 
     def unpuppet_object(self, sessid):