Core/Quest: Optimize and clean more last commit

* thx to @Gacko and @click for pointing out problems and give suggestiosn
* Sorry for the mess, forgot I can make more changes after initial change, this should be final...
* https://github.com/TrinityCore/TrinityCore/commit/48141bbfa6887095f5b4a687ca3bde516c751771

1 files changed, 4 insertions, 11 deletions

diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp
index f732497f278..5bf45452d34 100644
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/sholazar_basin.cpp
@@ -1016,20 +1016,13 @@ public:
             if (target == me)
                 return;
 
-            if (spell->Id == SPELL_DEVOUR_WIND)
+            if (spell->Id == SPELL_DEVOUR_WIND && me->GetCharmerOrOwnerPlayerOrPlayerItself())
             {
-                if (Player* player = me->GetCharmerOrOwnerPlayerOrPlayerItself())
-                {
-                    me->UpdateEntry(NPC_HAIPHOON_AIR);
-                }
+                me->UpdateEntry(NPC_HAIPHOON_AIR);
             }
-
-            if (spell->Id == SPELL_DEVOUR_WATER)
+            else if (spell->Id == SPELL_DEVOUR_WATER && me->GetCharmerOrOwnerPlayerOrPlayerItself())
             {
-                if (Player* player = me->GetCharmerOrOwnerPlayerOrPlayerItself())
-                {
-                    me->UpdateEntry(NPC_HAIPHOON_WATER);
-                }
+                me->UpdateEntry(NPC_HAIPHOON_WATER);
             }
         }
     };