aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-02-11 11:46:55 +0100
committerShauren <shauren.trinity@gmail.com>2017-02-11 11:46:55 +0100
commit87513871dc3c8131d089de0fdc0f8c31f2bc2832 (patch)
treeb3ca00814ff746f8364f024605eb18324bf5a725
parentf055039f58e24d5c5878ed19f3ac845860333f7d (diff)
Fixup pr e5e8537c3ef6cfc5d1bcb9c076a7c75f7e66a619
-rw-r--r--sql/updates/world/master/2017_02_10_01_world.sql2
-rw-r--r--src/server/scripts/Spells/spell_warrior.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/sql/updates/world/master/2017_02_10_01_world.sql b/sql/updates/world/master/2017_02_10_01_world.sql
index d2883ba7eb6..88d84baab14 100644
--- a/sql/updates/world/master/2017_02_10_01_world.sql
+++ b/sql/updates/world/master/2017_02_10_01_world.sql
@@ -1,4 +1,4 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_victorious';
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_warr_victorious','spell_warr_victory_rush');
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(34428,'spell_warr_victory_rush');
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 6761b6b86ea..3bfc606381c 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -842,11 +842,7 @@ class spell_warr_victory_rush : public SpellScriptLoader
void HandleHeal()
{
- if (!GetHitUnit())
- return;
-
Unit* caster = GetCaster();
-
caster->CastSpell(caster, SPELL_WARRIOR_VICTORY_RUSH_HEAL, true);
caster->RemoveAurasDueToSpell(SPELL_WARRIOR_VICTORIOUS);
}