nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-18 19:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/Event): Always the nearest baker should throw Complimentary Brewfest Sampler back. (#8204)

Browse Source 
- Closes #8027
This commit is contained in:
UltraNix
2021-10-07 13:06:08 +02:00
committed by GitHub
parent 14da707c6e
commit c4ebfb4426
1 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/server/scripts/Events/brewfest.cpp
View File

@@ -1675,7 +1675,6 @@ public:
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
Creature* cr = nullptr;
Unit* caster = GetCaster();
if (!caster)
return;
@@ -1683,23 +1682,49 @@ public:
if (!GetHitUnit() || GetHitUnit()->GetGUID() != caster->GetGUID())
return;
std::vector<Creature*> bakers;
if (caster->GetMapId() == 1) // Kalimdor
{
if ((cr = caster->FindNearestCreature(NPC_NORMAL_VOODOO, 40.0f)))
cr->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true);
else if ((cr = caster->FindNearestCreature(NPC_NORMAL_DROHN, 40.0f)))
cr->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true);
else if ((cr = caster->FindNearestCreature(NPC_NORMAL_GORDOK, 40.0f)))
cr->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true);
if (Creature* creature = caster->FindNearestCreature(NPC_NORMAL_VOODOO, 40.0f))
{
bakers.push_back(creature);
}
if (Creature* creature = caster->FindNearestCreature(NPC_NORMAL_DROHN, 40.0f))
{
bakers.push_back(creature);
}
if (Creature* creature = caster->FindNearestCreature(NPC_NORMAL_GORDOK, 40.0f))
{
bakers.push_back(creature);
}
}
else // EK
{
if ((cr = caster->FindNearestCreature(NPC_NORMAL_THUNDERBREW, 40.0f)))
cr->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true);
else if ((cr = caster->FindNearestCreature(NPC_NORMAL_BARLEYBREW, 40.0f)))
cr->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true);
else if ((cr = caster->FindNearestCreature(NPC_NORMAL_GORDOK, 40.0f)))
cr->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true);
if (Creature* creature = caster->FindNearestCreature(NPC_NORMAL_THUNDERBREW, 40.0f))
{
bakers.push_back(creature);
}
if (Creature* creature = caster->FindNearestCreature(NPC_NORMAL_BARLEYBREW, 40.0f))
{
bakers.push_back(creature);
}
if (Creature* creature = caster->FindNearestCreature(NPC_NORMAL_GORDOK, 40.0f))
{
bakers.push_back(creature);
}
}
if (!bakers.empty())
{
std::sort(bakers.begin(), bakers.end(), Acore::ObjectDistanceOrderPred(caster));
if (Creature* creature = *bakers.begin())
{
creature->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true);
}
}
}