diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2016-02-27 17:55:43 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2016-02-27 17:55:43 +0100 |
| commit | ffdf75a23316223b621793cd2b0288f394a774ff (patch) | |
| tree | 129175461d75dcb6e813abfdba00a3e998b2daa0 /src | |
| parent | 9beeca79ac0ece4fd07ccd83921a7ec93cb85efa (diff) | |
Scripts/Spells: Glyph of Arcane Shot is affected by own debuffs on target only
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Logging/Log.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_hunter.cpp | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index 07fb7c280f4..a80a4671822 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -219,7 +219,7 @@ void Log::ReadLoggersFromConfig() rootLogger.addAppender(appender->getId(), appender); Logger& serverLogger = loggers["server"]; - serverLogger.Create("server", LOG_LEVEL_ERROR); + serverLogger.Create("server", LOG_LEVEL_INFO); serverLogger.addAppender(appender->getId(), appender); } } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index c927750e968..4d7cc277ff6 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -193,8 +193,8 @@ class spell_hun_chimera_shot : public SpellScriptLoader { uint32 spellId = 0; int32 basePoint = 0; - Unit::AuraApplicationMap& Auras = unitTarget->GetAppliedAuras(); - for (Unit::AuraApplicationMap::iterator i = Auras.begin(); i != Auras.end(); ++i) + Unit::AuraApplicationMap const& auras = unitTarget->GetAppliedAuras(); + for (Unit::AuraApplicationMap::const_iterator i = auras.begin(); i != auras.end(); ++i) { Aura* aura = i->second->GetBase(); if (aura->GetCasterGUID() != caster->GetGUID()) @@ -318,12 +318,15 @@ class spell_hun_glyph_of_arcane_shot : public SpellScriptLoader { if (Unit* procTarget = eventInfo.GetProcTarget()) { - Unit::AuraApplicationMap& auras = procTarget->GetAppliedAuras(); + Unit::AuraApplicationMap const& auras = procTarget->GetAppliedAuras(); for (Unit::AuraApplicationMap::const_iterator i = auras.begin(); i != auras.end(); ++i) { - SpellInfo const* spellInfo = i->second->GetBase()->GetSpellInfo(); + Aura const* aura = i->second->GetBase(); + if (aura->GetCasterGUID() != GetTarget()->GetGUID()) + continue; // Search only Serpent Sting, Viper Sting, Scorpid Sting, Wyvern Sting - if (spellInfo->SpellFamilyFlags.HasFlag(0xC000, 0x1080) && spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER) + if (aura->GetSpellInfo()->SpellFamilyName == SPELLFAMILY_HUNTER + && aura->GetSpellInfo()->SpellFamilyFlags.HasFlag(0xC000, 0x1080)) return true; } } |