aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-03-03 21:36:56 -0300
committerShauren <shauren.trinity@gmail.com>2019-08-17 20:04:14 +0200
commitfa46e7c40606fcbd14973075d2ed262708049ffb (patch)
treef5763a872795a73c10039c246260fd1c2866913e
parent378de1fde0e35efc61ef0834184e69db8e0cbd6c (diff)
Core/Spells: fix some db errors
(cherrypicked from ebba8dcba87190cfdef55bd896a11d2d234cd754)
-rw-r--r--sql/updates/world/master/2019_08_03_01_world_2017_03_04_00_world.sql1
-rw-r--r--src/server/game/Spells/SpellMgr.cpp6
2 files changed, 3 insertions, 4 deletions
diff --git a/sql/updates/world/master/2019_08_03_01_world_2017_03_04_00_world.sql b/sql/updates/world/master/2019_08_03_01_world_2017_03_04_00_world.sql
new file mode 100644
index 00000000000..874d19831ee
--- /dev/null
+++ b/sql/updates/world/master/2019_08_03_01_world_2017_03_04_00_world.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_proc` WHERE `SpellId` IN (8178, 38857);
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index a5025cdd4cd..3ae90e7449a 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3616,10 +3616,8 @@ void SpellMgr::LoadSpellInfoCorrections()
}
// disable proc for magnet auras, they're handled differently
- for (uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j)
- if (SpellEffectInfo const* spellEffectInfo = spellInfo->GetEffect(DIFFICULTY_NONE, i))
- if (spellEffectInfo->IsAura(SPELL_AURA_SPELL_MAGNET))
- spellInfo->ProcFlags = 0;
+ if (spellInfo->HasAura(DIFFICULTY_NONE, SPELL_AURA_SPELL_MAGNET))
+ spellInfo->ProcFlags = 0;
if (spellInfo->ActiveIconFileDataId == 135754) // flight
spellInfo->Attributes |= SPELL_ATTR0_PASSIVE;