sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core/Instance): Modernize a few player iterations (#17717)

Browse Source
This commit is contained in:
Andrew
2023-11-15 14:14:17 -03:00
committed by GitHub
parent c827a0c1c1
commit 590c2d7ea1
1 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Instances/InstanceScript.cpp
+19 -34
View File
@@ -591,81 +591,66 @@ void InstanceScript::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData)
// Send Notify to all players in instance // Send Notify to all players in instance
void InstanceScript::DoSendNotifyToInstance(char const* format, ...) void InstanceScript::DoSendNotifyToInstance(char const* format, ...)
{ {
InstanceMap::PlayerList const& players = instance->GetPlayers(); if (!instance->GetPlayers().IsEmpty())
if (!players.IsEmpty())
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
char buff[1024]; char buff[1024];
vsnprintf(buff, 1024, format, ap); vsnprintf(buff, 1024, format, ap);
va_end(ap); va_end(ap);
for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
if (Player* player = i->GetSource()) instance->DoForAllPlayers([&, buff](Player* player)
{
player->GetSession()->SendNotification("%s", buff); player->GetSession()->SendNotification("%s", buff);
});
} }
} }
// Update Achievement Criteria for all players in instance // Update Achievement Criteria for all players in instance
void InstanceScript::DoUpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= nullptr*/) void InstanceScript::DoUpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= nullptr*/)
{ {
Map::PlayerList const& PlayerList = instance->GetPlayers(); instance->DoForAllPlayers([&](Player* player)
{
if (!PlayerList.IsEmpty())
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* player = i->GetSource())
player->UpdateAchievementCriteria(type, miscValue1, miscValue2, unit); player->UpdateAchievementCriteria(type, miscValue1, miscValue2, unit);
});
} }
// Start timed achievement for all players in instance // Start timed achievement for all players in instance
void InstanceScript::DoStartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry) void InstanceScript::DoStartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry)
{ {
Map::PlayerList const& PlayerList = instance->GetPlayers(); instance->DoForAllPlayers([&](Player* player)
{
if (!PlayerList.IsEmpty())
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* player = i->GetSource())
player->StartTimedAchievement(type, entry); player->StartTimedAchievement(type, entry);
});
} }
// Stop timed achievement for all players in instance // Stop timed achievement for all players in instance
void InstanceScript::DoStopTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry) void InstanceScript::DoStopTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry)
{ {
Map::PlayerList const& PlayerList = instance->GetPlayers(); instance->DoForAllPlayers([&](Player* player)
{
if (!PlayerList.IsEmpty())
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* player = i->GetSource())
player->RemoveTimedAchievement(type, entry); player->RemoveTimedAchievement(type, entry);
});
} }
// Remove Auras due to Spell on all players in instance // Remove Auras due to Spell on all players in instance
void InstanceScript::DoRemoveAurasDueToSpellOnPlayers(uint32 spell) void InstanceScript::DoRemoveAurasDueToSpellOnPlayers(uint32 spell)
{ {
Map::PlayerList const& PlayerList = instance->GetPlayers(); instance->DoForAllPlayers([&](Player* player)
if (!PlayerList.IsEmpty())
{
for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
{
if (Player* player = itr->GetSource())
{ {
player->RemoveAurasDueToSpell(spell); player->RemoveAurasDueToSpell(spell);
if (Pet* pet = player->GetPet()) if (Pet* pet = player->GetPet())
pet->RemoveAurasDueToSpell(spell); pet->RemoveAurasDueToSpell(spell);
} });
}
}
} }
// Cast spell on all players in instance // Cast spell on all players in instance
void InstanceScript::DoCastSpellOnPlayers(uint32 spell) void InstanceScript::DoCastSpellOnPlayers(uint32 spell)
{ {
Map::PlayerList const& PlayerList = instance->GetPlayers(); instance->DoForAllPlayers([&](Player* player)
{
if (!PlayerList.IsEmpty())
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* player = i->GetSource())
player->CastSpell(player, spell, true); player->CastSpell(player, spell, true);
});
} }
void InstanceScript::DoCastSpellOnPlayer(Player* player, uint32 spell, bool includePets /*= false*/, bool includeControlled /*= false*/) void InstanceScript::DoCastSpellOnPlayer(Player* player, uint32 spell, bool includePets /*= false*/, bool includeControlled /*= false*/)