@@ -105,9 +105,9 @@ bool IOLoginDataLoad::preLoadPlayer(std::shared_ptr<Player> player, const std::s
105105 return true ;
106106}
107107
108- bool IOLoginDataLoad::loadPlayerFirst (std::shared_ptr<Player> player, DBResult_ptr result) {
108+ bool IOLoginDataLoad::loadPlayerBasicInfo (std::shared_ptr<Player> player, DBResult_ptr result) {
109109 if (!result || !player) {
110- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
110+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
111111 return false ;
112112 }
113113
@@ -184,12 +184,15 @@ bool IOLoginDataLoad::loadPlayerFirst(std::shared_ptr<Player> player, DBResult_p
184184 player->setMaxManaShield (result->getNumber <uint32_t >(" max_manashield" ));
185185
186186 player->setMarriageSpouse (result->getNumber <int32_t >(" marriage_spouse" ));
187+
188+ // Experience load
189+ IOLoginDataLoad::loadPlayerExperience (player, result);
187190 return true ;
188191}
189192
190193void IOLoginDataLoad::loadPlayerExperience (std::shared_ptr<Player> player, DBResult_ptr result) {
191194 if (!result || !player) {
192- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
195+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
193196 return ;
194197 }
195198
@@ -212,7 +215,7 @@ void IOLoginDataLoad::loadPlayerExperience(std::shared_ptr<Player> player, DBRes
212215
213216void IOLoginDataLoad::loadPlayerBlessings (std::shared_ptr<Player> player, DBResult_ptr result) {
214217 if (!result || !player) {
215- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
218+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
216219 return ;
217220 }
218221
@@ -223,7 +226,7 @@ void IOLoginDataLoad::loadPlayerBlessings(std::shared_ptr<Player> player, DBResu
223226
224227void IOLoginDataLoad::loadPlayerConditions (std::shared_ptr<Player> player, DBResult_ptr result) {
225228 if (!result || !player) {
226- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
229+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
227230 return ;
228231 }
229232
@@ -243,13 +246,13 @@ void IOLoginDataLoad::loadPlayerConditions(std::shared_ptr<Player> player, DBRes
243246
244247void IOLoginDataLoad::loadPlayerDefaultOutfit (std::shared_ptr<Player> player, DBResult_ptr result) {
245248 if (!result || !player) {
246- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
249+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
247250 return ;
248251 }
249252
250253 player->defaultOutfit .lookType = result->getNumber <uint16_t >(" looktype" );
251254 if (g_configManager ().getBoolean (WARN_UNSAFE_SCRIPTS, __FUNCTION__) && player->defaultOutfit .lookType != 0 && !g_game ().isLookTypeRegistered (player->defaultOutfit .lookType )) {
252- g_logger ().warn (" [IOLoginData::loadPlayer ] An unregistered creature looktype type with id '{}' was blocked to prevent client crash." , player->defaultOutfit .lookType );
255+ g_logger ().warn (" [{} ] An unregistered creature looktype type with id '{}' was blocked to prevent client crash." , __FUNCTION__ , player->defaultOutfit .lookType );
253256 return ;
254257 }
255258
@@ -265,7 +268,7 @@ void IOLoginDataLoad::loadPlayerDefaultOutfit(std::shared_ptr<Player> player, DB
265268 player->defaultOutfit .lookFamiliarsType = result->getNumber <uint16_t >(" lookfamiliarstype" );
266269
267270 if (g_configManager ().getBoolean (WARN_UNSAFE_SCRIPTS, __FUNCTION__) && player->defaultOutfit .lookFamiliarsType != 0 && !g_game ().isLookTypeRegistered (player->defaultOutfit .lookFamiliarsType )) {
268- g_logger ().warn (" [IOLoginData::loadPlayer ] An unregistered creature looktype type with id '{}' was blocked to prevent client crash." , player->defaultOutfit .lookFamiliarsType );
271+ g_logger ().warn (" [{} ] An unregistered creature looktype type with id '{}' was blocked to prevent client crash." , __FUNCTION__ , player->defaultOutfit .lookFamiliarsType );
269272 return ;
270273 }
271274
@@ -274,7 +277,7 @@ void IOLoginDataLoad::loadPlayerDefaultOutfit(std::shared_ptr<Player> player, DB
274277
275278void IOLoginDataLoad::loadPlayerSkullSystem (std::shared_ptr<Player> player, DBResult_ptr result) {
276279 if (!result || !player) {
277- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
280+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
278281 return ;
279282 }
280283
@@ -296,7 +299,7 @@ void IOLoginDataLoad::loadPlayerSkullSystem(std::shared_ptr<Player> player, DBRe
296299
297300void IOLoginDataLoad::loadPlayerSkill (std::shared_ptr<Player> player, DBResult_ptr result) {
298301 if (!result || !player) {
299- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
302+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
300303 return ;
301304 }
302305
@@ -318,7 +321,7 @@ void IOLoginDataLoad::loadPlayerSkill(std::shared_ptr<Player> player, DBResult_p
318321
319322void IOLoginDataLoad::loadPlayerKills (std::shared_ptr<Player> player, DBResult_ptr result) {
320323 if (!result || !player) {
321- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
324+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
322325 return ;
323326 }
324327
@@ -337,7 +340,7 @@ void IOLoginDataLoad::loadPlayerKills(std::shared_ptr<Player> player, DBResult_p
337340
338341void IOLoginDataLoad::loadPlayerGuild (std::shared_ptr<Player> player, DBResult_ptr result) {
339342 if (!result || !player) {
340- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
343+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
341344 return ;
342345 }
343346
@@ -387,7 +390,7 @@ void IOLoginDataLoad::loadPlayerGuild(std::shared_ptr<Player> player, DBResult_p
387390
388391void IOLoginDataLoad::loadPlayerStashItems (std::shared_ptr<Player> player, DBResult_ptr result) {
389392 if (!result || !player) {
390- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
393+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
391394 return ;
392395 }
393396
@@ -403,7 +406,7 @@ void IOLoginDataLoad::loadPlayerStashItems(std::shared_ptr<Player> player, DBRes
403406
404407void IOLoginDataLoad::loadPlayerBestiaryCharms (std::shared_ptr<Player> player, DBResult_ptr result) {
405408 if (!result || !player) {
406- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
409+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
407410 return ;
408411 }
409412
@@ -456,7 +459,7 @@ void IOLoginDataLoad::loadPlayerBestiaryCharms(std::shared_ptr<Player> player, D
456459
457460void IOLoginDataLoad::loadPlayerInstantSpellList (std::shared_ptr<Player> player, DBResult_ptr result) {
458461 if (!player) {
459- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player nullptr: {} " , __FUNCTION__);
462+ g_logger ().warn (" [{} ] - Player nullptr" , __FUNCTION__);
460463 return ;
461464 }
462465
@@ -472,7 +475,7 @@ void IOLoginDataLoad::loadPlayerInstantSpellList(std::shared_ptr<Player> player,
472475
473476void IOLoginDataLoad::loadPlayerInventoryItems (std::shared_ptr<Player> player, DBResult_ptr result) {
474477 if (!result || !player) {
475- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
478+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
476479 return ;
477480 }
478481
@@ -554,7 +557,7 @@ void IOLoginDataLoad::loadPlayerInventoryItems(std::shared_ptr<Player> player, D
554557
555558void IOLoginDataLoad::loadPlayerStoreInbox (std::shared_ptr<Player> player) {
556559 if (!player) {
557- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player nullptr: {} " , __FUNCTION__);
560+ g_logger ().warn (" [{} ] - Player nullptr" , __FUNCTION__);
558561 return ;
559562 }
560563
@@ -565,7 +568,7 @@ void IOLoginDataLoad::loadPlayerStoreInbox(std::shared_ptr<Player> player) {
565568
566569void IOLoginDataLoad::loadRewardItems (std::shared_ptr<Player> player) {
567570 if (!player) {
568- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player nullptr: {} " , __FUNCTION__);
571+ g_logger ().warn (" [{} ] - Player nullptr" , __FUNCTION__);
569572 return ;
570573 }
571574
@@ -583,7 +586,7 @@ void IOLoginDataLoad::loadRewardItems(std::shared_ptr<Player> player) {
583586
584587void IOLoginDataLoad::loadPlayerDepotItems (std::shared_ptr<Player> player, DBResult_ptr result) {
585588 if (!result || !player) {
586- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
589+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
587590 return ;
588591 }
589592
@@ -622,7 +625,7 @@ void IOLoginDataLoad::loadPlayerDepotItems(std::shared_ptr<Player> player, DBRes
622625
623626void IOLoginDataLoad::loadPlayerInboxItems (std::shared_ptr<Player> player, DBResult_ptr result) {
624627 if (!result || !player) {
625- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
628+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
626629 return ;
627630 }
628631
@@ -658,7 +661,7 @@ void IOLoginDataLoad::loadPlayerInboxItems(std::shared_ptr<Player> player, DBRes
658661
659662void IOLoginDataLoad::loadPlayerStorageMap (std::shared_ptr<Player> player, DBResult_ptr result) {
660663 if (!result || !player) {
661- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
664+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
662665 return ;
663666 }
664667
@@ -674,7 +677,7 @@ void IOLoginDataLoad::loadPlayerStorageMap(std::shared_ptr<Player> player, DBRes
674677
675678void IOLoginDataLoad::loadPlayerVip (std::shared_ptr<Player> player, DBResult_ptr result) {
676679 if (!result || !player) {
677- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
680+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
678681 return ;
679682 }
680683
@@ -712,7 +715,7 @@ void IOLoginDataLoad::loadPlayerVip(std::shared_ptr<Player> player, DBResult_ptr
712715
713716void IOLoginDataLoad::loadPlayerPreyClass (std::shared_ptr<Player> player, DBResult_ptr result) {
714717 if (!result || !player) {
715- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
718+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
716719 return ;
717720 }
718721
@@ -759,7 +762,7 @@ void IOLoginDataLoad::loadPlayerPreyClass(std::shared_ptr<Player> player, DBResu
759762
760763void IOLoginDataLoad::loadPlayerTaskHuntingClass (std::shared_ptr<Player> player, DBResult_ptr result) {
761764 if (!result || !player) {
762- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
765+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
763766 return ;
764767 }
765768
@@ -809,7 +812,7 @@ void IOLoginDataLoad::loadPlayerTaskHuntingClass(std::shared_ptr<Player> player,
809812
810813void IOLoginDataLoad::loadPlayerForgeHistory (std::shared_ptr<Player> player, DBResult_ptr result) {
811814 if (!result || !player) {
812- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
815+ g_logger ().warn (" [{} ] - Player or Result nullptr" , __FUNCTION__);
813816 return ;
814817 }
815818
@@ -830,12 +833,12 @@ void IOLoginDataLoad::loadPlayerForgeHistory(std::shared_ptr<Player> player, DBR
830833
831834void IOLoginDataLoad::loadPlayerBosstiary (std::shared_ptr<Player> player, DBResult_ptr result) {
832835 if (!result) {
833- g_logger ().warn (" [IOLoginData::loadPlayer ] - Result nullptr: {} " , __FUNCTION__);
836+ g_logger ().warn (" [{} ] - Result nullptr" , __FUNCTION__);
834837 return ;
835838 }
836839
837840 if (!player) {
838- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player or Result nullptr: {} " , __FUNCTION__);
841+ g_logger ().warn (" [{} ] - Player nullptr" , __FUNCTION__);
839842 return ;
840843 }
841844
@@ -867,7 +870,7 @@ void IOLoginDataLoad::loadPlayerBosstiary(std::shared_ptr<Player> player, DBResu
867870
868871void IOLoginDataLoad::bindRewardBag (std::shared_ptr<Player> player, ItemsMap &rewardItemsMap) {
869872 if (!player) {
870- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player nullptr: {} " , __FUNCTION__);
873+ g_logger ().warn (" [{} ] - Player nullptr" , __FUNCTION__);
871874 return ;
872875 }
873876
@@ -907,7 +910,7 @@ void IOLoginDataLoad::insertItemsIntoRewardBag(const ItemsMap &rewardItemsMap) {
907910
908911void IOLoginDataLoad::loadPlayerInitializeSystem (std::shared_ptr<Player> player) {
909912 if (!player) {
910- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player nullptr: {} " , __FUNCTION__);
913+ g_logger ().warn (" [{} ] - Player nullptr" , __FUNCTION__);
911914 return ;
912915 }
913916
@@ -926,7 +929,7 @@ void IOLoginDataLoad::loadPlayerInitializeSystem(std::shared_ptr<Player> player)
926929
927930void IOLoginDataLoad::loadPlayerUpdateSystem (std::shared_ptr<Player> player) {
928931 if (!player) {
929- g_logger ().warn (" [IOLoginData::loadPlayer ] - Player nullptr: {} " , __FUNCTION__);
932+ g_logger ().warn (" [{} ] - Player nullptr" , __FUNCTION__);
930933 return ;
931934 }
932935
0 commit comments