From c220d5eeeb5263ffc6560dd3d0aa93cb830041d5 Mon Sep 17 00:00:00 2001
From: Ahmed Charles <acharles@outlook.com>
Date: Fri, 23 Oct 2015 23:07:22 +0000
Subject: [PATCH] at_post_puppet should be called after cache_lock_bypass.

at_post_puppet does a look, which results in a perms check, which is wrong
for the superuser because the lock bypass is not up to date.
---
 evennia/players/players.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/players/players.py b/evennia/players/players.py
index 7c4a302662..63e840edc7 100644
--- a/evennia/players/players.py
+++ b/evennia/players/players.py
@@ -244,11 +244,11 @@ class DefaultPlayer(with_metaclass(TypeclassBase, PlayerDB)):
         # validate/start persistent scripts on object
         obj.scripts.validate()
 
-        obj.at_post_puppet()
-
         # re-cache locks to make sure superuser bypass is updated
         obj.locks.cache_lock_bypass(obj)
 
+        obj.at_post_puppet()
+
     def unpuppet_object(self, sessid):
         """
         Disengage control over an object.