Earth Shield - Occasionally fails to proc

[LordUsagi]

Earth Shield will proc a charge every melee hit, but you'll only be healed for every second or third hit.

Now I know the ability says this can only occur every few seconds, but should it still remove the charge if the heal cannot occur?

[Vincent-Michael]

http://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/

[joschiwald]

i know, atm. i have no time to fix it in a pr

diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -302,23 +302,29 @@ class spell_sha_earth_shield : public SpellScriptLoader
                 }
             }

-            void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
+            bool CheckProc(ProcEventInfo& /*eventInfo*/)
             {
-                PreventDefaultAction();
-
                 //! HACK due to currenct proc system implementation
                 if (Player* player = GetTarget()->ToPlayer())
                     if (player->HasSpellCooldown(SPELL_SHAMAN_EARTH_SHIELD_HEAL))
-                        return;
+                        return false;
+                return true;
+            }
+
+            void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
+            {
+                PreventDefaultAction();

                 GetTarget()->CastCustomSpell(SPELL_SHAMAN_EARTH_SHIELD_HEAL, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff, GetCasterGUID());

+                /// @ HACK due to currenct proc system implementation
                 if (Player* player = GetTarget()->ToPlayer())
                     player->AddSpellCooldown(SPELL_SHAMAN_EARTH_SHIELD_HEAL, 0, time(NULL) + 3);
             }

             void Register()
             {
+                DoCheckProc += AuraCheckProcFn(spell_sha_earth_shield_AuraScript::CheckProc);
                 DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_earth_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_DUMMY);
                 OnEffectProc += AuraEffectProcFn(spell_sha_earth_shield_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
             }

[LordUsagi]

Kind of love you ^

[digz6666]

Thank you @joschiwald 👍

[LordUsagi]

Can we get a PR of this and close it

[Jildor]

How to reproduce the bug?

[impas]

Earth Shield doesnt work again on 4.3.4 branch