From f1d743f14c4afc56524d534aa6f1e3866978e6cd Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 15 Sep 2011 01:18:53 +0200
Subject: [PATCH] Checked at_init() due to reported issues of it not getting
 called. Couldn't find any problems, rather it was called too many times, so
 removed an unecessary call.

---
 src/objects/objects.py      | 1 +
 src/server/amp.py           | 4 +---
 src/server/serversession.py | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/objects/objects.py b/src/objects/objects.py
index dcfe4103e5..d77a226f31 100644
--- a/src/objects/objects.py
+++ b/src/objects/objects.py
@@ -85,6 +85,7 @@ class Object(TypeClass):
         the server without the players logging out), put it here.
         """
         pass 
+    
 
     def basetype_posthook_setup(self):
         """
diff --git a/src/server/amp.py b/src/server/amp.py
index c6c7a23875..e82668aa10 100644
--- a/src/server/amp.py
+++ b/src/server/amp.py
@@ -268,13 +268,12 @@ class AMPProtocol(amp.AMP):
         #print "serveradmin (server side):", sessid, operation, data
 
         if operation == 'PCONN': #portal_session_connect
-            # create a new, session and sync it
+            # create a new session and sync it
             sess = ServerSession()
             sess.sessionhandler = self.factory.server.sessions
             sess.load_sync_data(data)            
             if sess.logged_in and sess.uid:
                 # this can happen in the case of auto-authenticating protocols like SSH
-                
                 sess.player = PlayerDB.objects.get_player_from_uid(sess.uid)
                 sess.at_sync() # this runs initialization without acr
 
@@ -296,7 +295,6 @@ class AMPProtocol(amp.AMP):
                 sess.load_sync_data(sessdict)
                 if sess.uid:
                     sess.player = PlayerDB.objects.get_player_from_uid(sess.uid)
-                sess.at_sync()
                 sesslist.append(sess)
             # replace sessions on server
             server_sessionhandler.portal_session_sync(sesslist)            
diff --git a/src/server/serversession.py b/src/server/serversession.py
index ad903d2e3b..1be24a401c 100644
--- a/src/server/serversession.py
+++ b/src/server/serversession.py
@@ -53,8 +53,10 @@ class ServerSession(Session):
         player = self.get_player()
         character = self.get_character()
         if player:
+            #print "sync: at_init() - player"
             player.at_init()
         if character:
+            #print "sync: at_init() - character"
             character.at_init()
             # start (persistent) scripts on this object
             ScriptDB.objects.validate(obj=character)
@@ -82,6 +84,7 @@ class ServerSession(Session):
         self.user.save()        
         
         # player init
+        #print "at_init() - player"
         player.at_init()
         
         # Check if this is the first time the *player* logs in 
@@ -91,6 +94,7 @@ class ServerSession(Session):
         player.at_pre_login()        
 
         character = player.character
+        #print "at_init() - character"
         character.at_init()
         if character: 
             # this player has a character. Check if it's the
@@ -101,9 +105,6 @@ class ServerSession(Session):
             # run character login hook
             character.at_pre_login()
 
-        # this is always called first
-        player.at_init()
-
         self.log(_('Logged in: %(self)s') % {'self': self})
 
         # start (persistent) scripts on this object