Changeset 128 for trunk

Timestamp:

11/19/08 13:38:43 (17 years ago)

Author:

yumileroy

Message:

[svn] * Prevent crash at access to deleted social data for player. Remove social data at logout instead - source mangos
* Fixed subcommands list output at console. - source mangos
* Rename scripts update.

Original author: KingPin?
Date: 2008-10-28 08:10:44-05:00

Location:

trunk

Files:

• sql/updates/117_trinityscript.sql (deleted)
• sql/updates/117_world_scripts.sql (added)
• src/game/Chat.cpp (modified) (1 diff)
• src/game/Player.cpp (modified) (1 diff)
• src/game/SpellEffects.cpp (modified) (1 diff)
• src/game/WorldSession.cpp (modified) (1 diff)

trunk/src/game/Chat.cpp

@@ -796 +796 @@
             continue;
 
-        (list += "\n    ") += table[i].Name;
+        if(m_session)
+            list += "\n    ";
+        else
+            list += "\n\r    ";
+
+        list += table[i].Name;
+
                 if(table[i].ChildCommands)
                         list += " ...";

trunk/src/game/Player.cpp

@@ -434 +434 @@
     CleanupsBeforeDelete();
 
-    if(m_uint32Values)                                      // only for fully created Object
-    {
-        sSocialMgr.RemovePlayerSocial(GetGUIDLow());
-    }
+    //m_social = NULL;
 
     // Note: buy back item already deleted from DB when player was saved

trunk/src/game/SpellEffects.cpp

@@ -4899 +4899 @@
 
     // caster or target already have requested duel
-    if( caster->duel || target->duel || target->GetSocial()->HasIgnore(caster->GetGUIDLow()) )
+    if( caster->duel || target->duel || !target->GetSocial() || target->GetSocial()->HasIgnore(caster->GetGUIDLow()) )
         return;
 

trunk/src/game/WorldSession.cpp

@@ -386 +386 @@
         _player->CleanupsBeforeDelete();                    // do some cleanup before deleting to prevent crash at crossreferences to already deleted data
 
+        sSocialMgr.RemovePlayerSocial (_player->GetGUIDLow ());
         delete _player;
         _player = NULL;