aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/SpellHandler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2021-12-28 20:35:48 +0100
committerShauren <shauren.trinity@gmail.com>2021-12-28 20:35:48 +0100
commit04b06ab35ff5be05794d0ce5a278bd0b6fa8d4b8 (patch)
tree9096c92b7b99cf6484f5994e4e0c7d618ad1e485 /src/server/game/Handlers/SpellHandler.cpp
parent3c12a189e430b1b6e0a452f272860f58b2dca7bd (diff)
Core/Auras: Delete old custom config AllowTrackBothResources, all tracking types can be turned on without it
Closes #27448
Diffstat (limited to 'src/server/game/Handlers/SpellHandler.cpp')
-rw-r--r--src/server/game/Handlers/SpellHandler.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
index 088cd8fbd70..e4731676e41 100644
--- a/src/server/game/Handlers/SpellHandler.cpp
+++ b/src/server/game/Handlers/SpellHandler.cpp
@@ -399,25 +399,6 @@ void WorldSession::HandleCancelAuraOpcode(WorldPackets::Spells::CancelAura& canc
return;
_player->RemoveOwnedAura(cancelAura.SpellID, cancelAura.CasterGUID, 0, AURA_REMOVE_BY_CANCEL);
-
- // If spell being removed is a resource tracker, see if player was tracking both (herbs / minerals) and remove the other
- if (sWorld->getBoolConfig(CONFIG_ALLOW_TRACK_BOTH_RESOURCES) && spellInfo->HasAura(SPELL_AURA_TRACK_RESOURCES))
- {
- Unit::AuraEffectList const& auraEffects = _player->GetAuraEffectsByType(SPELL_AURA_TRACK_RESOURCES);
- if (!auraEffects.empty())
- {
- // Build list of spell IDs to cancel. Trying to cancel the aura while iterating
- // over AuraEffectList caused "incompatible iterator" errors on second pass
- std::list<uint32> spellIDs;
-
- for (Unit::AuraEffectList::const_iterator auraEffect = auraEffects.begin(); auraEffect != auraEffects.end(); ++auraEffect)
- spellIDs.push_back((*auraEffect)->GetId());
-
- // Remove all auras related to resource tracking (only Herbs and Minerals in 3.3.5a)
- for (std::list<uint32>::iterator it = spellIDs.begin(); it != spellIDs.end(); ++it)
- _player->RemoveOwnedAura(*it, cancelAura.CasterGUID, 0, AURA_REMOVE_BY_CANCEL);
- }
- }
}
void WorldSession::HandlePetCancelAuraOpcode(WorldPackets::Spells::PetCancelAura& packet)