ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Core/Battlegrounds): despawn docks vehicles on IoC node contest (#25160)

Browse source 
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Andrew 2026-04-20 06:41:21 -03:00 • committed by GitHub
parent 020351f628
commit 5c89215f01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
View file

@ -745,6 +745,31 @@ void BattlegroundIC::HandleContestedNodes(ICNodePoint* nodePoint)
(*itr)->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
}
}
else if (nodePoint->nodeType == NODE_TYPE_DOCKS)
{
auto removeUnusedVehicles = [&](uint8 baseType, uint8 count)
{
for (uint8 i = 0; i < count; ++i)
{
uint8 type = baseType + i;
if (Creature* vehicle = GetBgMap()->GetCreature(BgCreatures[type]))
{
if (Vehicle* veh = vehicle->GetVehicleKit())
if (!veh->IsVehicleInUse())
{
respawnMap.erase(vehicle->GetGUID());
DelCreature(type);
}
}
}
};
uint8 glaiveBase = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_GLAIVE_THROWER_1_H : BG_IC_NPC_GLAIVE_THROWER_1_A);
removeUnusedVehicles(glaiveBase, MAX_GLAIVE_THROWERS_SPAWNS_PER_FACTION);
uint8 catapultBase = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_CATAPULT_1_H : BG_IC_NPC_CATAPULT_1_A);
removeUnusedVehicles(catapultBase, MAX_CATAPULTS_SPAWNS_PER_FACTION);
}
else if (nodePoint->nodeType == NODE_TYPE_REFINERY || nodePoint->nodeType == NODE_TYPE_QUARRY)
{
// nodePoint->faction is the assaulting team (set before this call);