[11662][Patch] Spell 37433

[anti-freak]

What bug does the patch fix? What features does the patch add?

this spell should ignore his knockback and dmg effekt if target is in water. (the lurker below: spout)

For which repository revision was the patch created?

[s1009]

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

No.

Who has been writing this patch? Please include either forum user names or email addresses.

me

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 930ff5c..49f7fcd 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -3739,6 +3739,10 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
    itemTarget = pItemTarget;
    gameObjTarget = pGOTarget;

+    //ignore knockback from spout (the lurker below)
+    if(m_spellInfo->Id == 37433 && unitTarget && unitTarget->IsInWater())
+        return;
+
    uint8 eff = m_spellInfo->Effect[i];

    damage = int32(CalculateDamage(i, unitTarget) * DamageMultiplier);

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index eb2aa20..f4c8687 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -356,6 +356,10 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                    case 38441:
                        damage = unitTarget->GetMaxHealth() / 2;
                        break;
+                    case 37433:
+                        if (unitTarget && unitTarget->IsInWater())
+                            return;
+                        break;
                }
                break;
            }

[VladimirMangos]

I think more correct way add somewhere to immunity special case. then target wil ignored for all effects.

This also better because exist similar spell and checks will be in same place.

Alt. patch : https://gist.github.com/961956

Not tested.

[Schmoozerd]

hmm, perhaps a wild guess, but are there any knockback effects that knockback players in water?

Edit: No this not the case, however players in water should not be knocked back as far as player on land

[VladimirMangos]

After additional think i select another way: add check to Spell::CheckTarget.

Patch in like form added in [11662]. Thank you.