josh/ThordekkCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pet Battles: Fix wild battle pet marking not working

Browse Source 
Two bugs prevented TryMarkAsWildBattlePet() from ever marking critters:

1. Init order: BattlePetMgr::Initialize() ran AFTER sMapMgr->Initialize(),
   so the species-by-creature map was empty during creature spawning.
   Moved battle pet initialization before map system startup.

2. Respawn flag wipe: TryMarkAsWildBattlePet() ran BEFORE
   setDeathState(JUST_RESPAWNED), which calls ReplaceAllNpcFlags from
   template, wiping the dynamically added UNIT_NPC_FLAG_WILD_BATTLE_PET.
   Moved TryMarkAsWildBattlePet() to after setDeathState.
This commit is contained in:
luis
2026-03-12 08:32:18 -03:00
parent 6df914d395
commit 8d332b0643
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/Creature.cpp
+3 -1
View File
@@ -2384,9 +2384,11 @@ void Creature::Respawn(bool force)
UpdateEntry(m_originalEntry);
SelectLevel();
TryMarkAsWildBattlePet();
// setDeathState(JUST_RESPAWNED) calls ReplaceAllNpcFlags from template,
// so TryMarkAsWildBattlePet must run AFTER to add the dynamic flag
setDeathState(JUST_RESPAWNED);
TryMarkAsWildBattlePet();
CreatureModel display(GetNativeDisplayId(), GetNativeDisplayScale(), 1.0f);
if (sObjectMgr->GetCreatureModelRandomGender(&display, GetCreatureTemplate()))
src/server/game/World/World.cpp
+8 -6
View File
@@ -2031,6 +2031,14 @@ bool World::SetInitialWorldSettings()
mail_timer_expires = ((DAY * IN_MILLISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval()));
TC_LOG_INFO("server.loading", "Mail timer set to: {}, mail return is called every {} minutes", uint64(mail_timer), uint64(mail_timer_expires));
// Battle pet data must be loaded before map initialization ? creature spawning
// calls TryMarkAsWildBattlePet() which needs the species-by-creature map populated
TC_LOG_INFO("server.loading", "Loading battle pets info...");
BattlePets::BattlePetMgr::Initialize();
TC_LOG_INFO("server.loading", "Initializing pet battle system...");
sPetBattleMgr->Initialize();
///- Initialize MapManager
TC_LOG_INFO("server.loading", "Starting Map System");
sMapMgr->Initialize();
@@ -2096,12 +2104,6 @@ bool World::SetInitialWorldSettings()
TC_LOG_INFO("server.loading", "Loading character templates...");
sCharacterTemplateDataStore->LoadCharacterTemplates();
TC_LOG_INFO("server.loading", "Loading battle pets info...");
BattlePets::BattlePetMgr::Initialize();
TC_LOG_INFO("server.loading", "Initializing pet battle system...");
sPetBattleMgr->Initialize();
TC_LOG_INFO("server.loading", "Loading scenarios");
sScenarioMgr->LoadDB2Data();
sScenarioMgr->LoadDBData();