Core/Spells: Cleaned up Shaman 4P Enhancement and Paladin 2P Retribution set bonus code

SQL: Added missing sql for that revision, thx cyberbrest

Closes #12

2 files changed, 5 insertions, 10 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index f6e2e6f83ea..58c21183982 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -8544,12 +8544,10 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
         case 53817:
         {
             // Item - Shaman T10 Enhancement 4P Bonus
-            if (AuraEffect * aurEff = ToPlayer()->GetAuraEffect(70832, 0))
-            {
-                if (Aura *maelstrom = GetAura(53817))
+            if (AuraEffect const* aurEff = GetAuraEffect(70832, 0))
+                if (Aura const* maelstrom = GetAura(53817))
                     if ((maelstrom->GetStackAmount() == maelstrom->GetSpellProto()->StackAmount) && roll_chance_i(aurEff->GetAmount()))               
                         CastSpell(this, 70831, true, castItem, triggeredByAura);
-            }
 
             // have rank dependent proc chance, ignore too often cases
             // PPM = 2.5 * (rank of talent),
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index c9b8f75b5fb..a7510b97ff3 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -618,12 +618,9 @@ public:
 
         void HandleScript(SpellEffIndex /*effIndex*/)
         {
-            Player *caster = GetCaster()->ToPlayer();
-            if (caster->GetTypeId() != TYPEID_PLAYER)
-                return;
-                       
-            if (caster->HasSpellCooldown(SPELL_DIVINE_STORM))
-            caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true);
+            if (Player *caster = GetCaster()->ToPlayer())
+                if (caster->HasSpellCooldown(SPELL_DIVINE_STORM))
+                    caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true);
         }
 
         void Register()