Deleting a player while it's in a guild cause the server to crash. (I…

…ssue Sphereserver#971).

When a player is deleted, the ClearPlayer method is called before the character destructor, in this method the m_pPlayer property is set to null and this cause the Guild_Resign method (found in the character destructor) to fail and not deleting the player from the guild.

So i just moved the Guild_Resign method from the destructor to the ClearPlayer method.

Changelog.txt

@@ -3094,4 +3094,6 @@ Notes:
 - Changed: AR (the old armour value) property can be displayed up to 65k. (Issue #968)
 - Changed: The DAM property (for both characters and weapons) can be displayed up to 65k. (Issue #967)
 - Added: t_armor_bone typedef (value 305). If you want to use it you need to add it in the core/defs_types_hardcoded.scp file under the typedef section. (Issue #890)
-
+
+03-12-2022, Drk84
+- Fix: Deleting a player while it's in a guild cause the server to crash. (Issue #971).

src/game/chars/CChar.cpp

@@ -342,9 +342,11 @@ CChar::~CChar()
         m_pParty->RemoveMember( GetUID(), GetUID() );
         m_pParty = nullptr;
     }
-    Guild_Resign(MEMORY_GUILD);
-    Guild_Resign(MEMORY_TOWN);
-    Attacker_RemoveChar();		// Removing me from enemy's attacker list (I asume that if he is on my list, I'm on his one and no one have me on their list if I dont have them)
+
+	//Guild_Resign(MEMORY_GUILD); Moved to ClearPlayer Method  otherwise this method will fail because the m_pPlayer property is already set to null.
+    //Guild_Resign(MEMORY_TOWN); Moved to ClearPlayer Method  otherwise this method will fail because the m_pPlayer property is already set to null.
+
+	Attacker_RemoveChar();		// Removing me from enemy's attacker list (I asume that if he is on my list, I'm on his one and no one have me on their list if I dont have them)
     if (m_pNPC)
         NPC_PetClearOwners();	// Clear follower slots on pet owner
 
@@ -563,7 +565,8 @@ void CChar::ClearPlayer()
 
 		pAccount->DetachChar(this);	// unlink me from my account.
 	}
-
+	Guild_Resign(MEMORY_GUILD);
+	Guild_Resign(MEMORY_TOWN);
     delete m_pPlayer;
     m_pPlayer = nullptr;
 }