diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Handlers/SpellHandler.cpp | 19 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 14 |
5 files changed, 0 insertions, 45 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) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 450f7c65ee5..0b6dacddae5 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -17,7 +17,6 @@ #include "Common.h" #include "CellImpl.h" -#include "Config.h" #include "DB2Stores.h" #include "DynamicObject.h" #include "GridNotifiersImpl.h" @@ -1595,15 +1594,6 @@ bool Aura::CanStackWith(Aura const* existingAura) const return true; } - // Check for custom server setting to allow tracking both Herbs and Minerals - // Note: The following are client limitations and cannot be coded for: - // * The minimap tracking icon will display whichever skill is activated second - // * The minimap tracking list will only show a check mark next to the last skill activated - // Sometimes this bugs out and doesn't switch the check mark. It has no effect on the actual tracking though. - // * The minimap dots are yellow for both resources - if (m_spellInfo->HasAura(SPELL_AURA_TRACK_RESOURCES) && existingSpellInfo->HasAura(SPELL_AURA_TRACK_RESOURCES)) - return sWorld->getBoolConfig(CONFIG_ALLOW_TRACK_BOTH_RESOURCES); - // check spell specific stack rules if (m_spellInfo->IsAuraExclusiveBySpecificWith(existingSpellInfo) || (sameCaster && m_spellInfo->IsAuraExclusiveBySpecificPerCasterWith(existingSpellInfo))) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 7d8c91d2398..e20c081883b 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1525,7 +1525,6 @@ void World::LoadConfigSettings(bool reload) if (m_int_configs[CONFIG_PVP_TOKEN_COUNT] < 1) m_int_configs[CONFIG_PVP_TOKEN_COUNT] = 1; - m_bool_configs[CONFIG_ALLOW_TRACK_BOTH_RESOURCES] = sConfigMgr->GetBoolDefault("AllowTrackBothResources", false); m_bool_configs[CONFIG_NO_RESET_TALENT_COST] = sConfigMgr->GetBoolDefault("NoResetTalentsCost", false); m_bool_configs[CONFIG_SHOW_KICK_IN_WORLD] = sConfigMgr->GetBoolDefault("ShowKickInWorld", false); m_bool_configs[CONFIG_SHOW_MUTE_IN_WORLD] = sConfigMgr->GetBoolDefault("ShowMuteInWorld", false); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 2383b0c6d10..a6a5cf411bb 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -171,7 +171,6 @@ enum WorldBoolConfigs CONFIG_STATS_LIMITS_ENABLE, CONFIG_INSTANCES_RESET_ANNOUNCE, CONFIG_IP_BASED_ACTION_LOGGING, - CONFIG_ALLOW_TRACK_BOTH_RESOURCES, CONFIG_CALCULATE_CREATURE_ZONE_AREA_DATA, CONFIG_CALCULATE_GAMEOBJECT_ZONE_AREA_DATA, CONFIG_FEATURE_SYSTEM_BPAY_STORE_ENABLED, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 505c5cc1306..70b824420d5 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -3169,20 +3169,6 @@ CharDelete.KeepDays = 30 ################################################################################################### # CUSTOM SERVER OPTIONS # -# AllowTrackBothResources -# Description: Allows players to track herbs and minerals at the same time (if they have the skills) -# Default: 0 - (Do not allow) -# 1 - (Allow) -# -# Note: The following are client limitations and cannot be coded for: -# * The minimap tracking icon will display whichever skill is activated second. -# * The minimap tracking list will only show a check mark next to the last skill activated (sometimes this -# bugs out and doesn't switch the check mark. It has no effect on the actual tracking though). -# * The minimap dots are yellow for both resources. - -AllowTrackBothResources = 0 - -# # PlayerStart.AllReputation # Description: Players will start with most of the high level reputations that are needed # for items, mounts etc. |