Core/Spells: Unify spell effect access api in both branches

2 files changed, 6 insertions, 9 deletions

diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index c7635efcef3..f49d7e92db0 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -286,12 +286,9 @@ bool EquippedOk(Player* player, uint32 spellId)
     if (!spell)
         return false;
 
-    for (SpellEffectInfo const* effect : spell->GetEffects())
+    for (SpellEffectInfo const& spellEffectInfo : spell->GetEffects())
     {
-        if (!effect)
-            continue;
-
-        uint32 reqSpell = effect->TriggerSpell;
+        uint32 reqSpell = spellEffectInfo.TriggerSpell;
         if (!reqSpell)
             continue;
 
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 0e0cf7a1d85..f51f9b70cd5 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -2220,10 +2220,10 @@ public:
                     break;
             }
 
-            if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId, DIFFICULTY_NONE))
-                if (SpellEffectInfo const* effect0 = spellInfo->GetEffect(EFFECT_0))
-                    if (effect0->Effect == SPELL_EFFECT_SUMMON_OBJECT_WILD)
-                        return effect0->MiscValue;
+            SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId, DIFFICULTY_NONE);
+
+            if (spellInfo && spellInfo->GetEffect(EFFECT_0).Effect == SPELL_EFFECT_SUMMON_OBJECT_WILD)
+                return spellInfo->GetEffect(EFFECT_0).MiscValue;
 
             return 0;
         }