From 5506686907c4fdaf3a1b557b38802f57de1645ba Mon Sep 17 00:00:00 2001
From: image <>
Date: Mon, 17 Aug 2020 22:04:20 -0400
Subject: [PATCH] Fix display default for false, avoids popups when hovering
 over knowledge book icons in newer clients, also replacement for starting
 skills/spells check

Helps address issue #165
---
 EQ2/source/WorldServer/client.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/EQ2/source/WorldServer/client.cpp b/EQ2/source/WorldServer/client.cpp
index f8925634b..b0aeb5207 100644
--- a/EQ2/source/WorldServer/client.cpp
+++ b/EQ2/source/WorldServer/client.cpp
@@ -286,11 +286,12 @@ void Client::SendLoginInfo() {
 
 	LogWrite(CCLIENT__DEBUG, 0, "Client", "Loading Character Skills for player '%s'...", player->GetName());
 	int32 count = database.LoadCharacterSkills(GetCharacterID(), player);
-	if (count == 0) {
-		LogWrite(CCLIENT__WARNING, 0, "Client", "No character skills found!");
-		database.UpdateStartingSkills(GetCharacterID(), player->GetAdventureClass(), player->GetRace());
-		database.LoadCharacterSkills(GetCharacterID(), player);
-	}
+
+	LogWrite(CCLIENT__DEBUG, 0, "Client", "Loading Character Spells for player '%s'...", player->GetName());
+	count = database.LoadCharacterSpells(GetCharacterID(), player);
+	
+	// get the latest character starting skills / spells, may have been updated after character creation
+	world.SyncCharacterAbilities(this);
 
 	count = database.LoadCharacterTitles(GetCharacterID(), player);
 	if (count == 0) {
@@ -303,12 +304,6 @@ void Client::SendLoginInfo() {
 	if (count == 0)
 		LogWrite(CCLIENT__DEBUG, 0, "Client", "No character languages loaded!");
 
-	count = database.LoadCharacterSpells(GetCharacterID(), player);
-	if (count == 0) {
-		LogWrite(CCLIENT__DEBUG, 0, "Client", "No character spells found!");
-		database.UpdateStartingSpells(GetCharacterID(), player->GetAdventureClass(), player->GetRace());
-		database.LoadCharacterSpells(GetCharacterID(), player);
-	}
 	count = database.LoadPlayerRecipeBooks(GetCharacterID(), player);
 	if (count == 0)
 		LogWrite(CCLIENT__DEBUG, 0, "Client", "No character recipe books found!");
@@ -2486,6 +2481,9 @@ void Client::HandleExamineInfoRequest(EQApplicationPacket* app) {
 			display = false;
 		else if (version <= 546)
 			display = request->getType_int8_ByName("display");
+		else if (version > 546)
+			display = false; // clients default is false otherwise it pops up a window when hovering over the knowledge book abilities
+
 		//printf("Type: (%i) Tier: (%u) Unknown ID: (%u) Item ID: (%u)\n",type,tier,trait_tier,id);
 
 		if (trait_tier != 0xFFFFFFFF) {