Browse Source

Fix world server crash against spell examine info

Fix #164 -- for now we will try the tier sent by client and fallback to tier 1 if it can't be found, if at that point we still fail we will not send any packet to the client.
image 3 years ago
parent
commit
802ffebd42
1 changed files with 11 additions and 1 deletions
  1. 11 1
      EQ2/source/WorldServer/client.cpp

+ 11 - 1
EQ2/source/WorldServer/client.cpp

@@ -2655,7 +2655,17 @@ void Client::HandleExamineInfoRequest(EQApplicationPacket* app) {
 		//data = master_aa_list.GetAltAdvancement(id);
 		//LogWrite(WORLD__INFO, 0, "World", "SOE Spell CRC: %u", data->spell_crc);
 		//spell = master_spell_list.GetSpellByCRC(data->spell_crc);
-		spell = master_spell_list.GetSpell(id, 1);
+		spell = master_spell_list.GetSpell(id, tier);
+
+		if (!spell)
+			spell = master_spell_list.GetSpell(id, 1);
+
+		if (!spell)
+		{
+			LogWrite(WORLD__ERROR, 0, "WORLD", "FAILED Examine Info Request-> Spell ID: %u, tier: %i", spell->GetSpellID(), tier);
+			return;
+		}
+
 		//if (spell && sent_spell_details.count(spell->GetSpellID()) == 0) {
 		sent_spell_details[spell->GetSpellID()] = true;
 		//	EQ2Packet* app = spell->SerializeAASpell(this,tier, data, false, GetItemPacketType(GetVersion()), 0x04);