aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-07-20 01:18:42 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-07-20 01:18:53 +0200
commit5252f1614fff634fbc17aa91febe682a3f3d4f59 (patch)
tree4c28a6867a5b37a6de607f9c7c3bb81f045228d1 /src/server/game
parent6a77af1b3ed9e0b4ca35373252c35a594829760e (diff)
Core/Spells: Convert/Update death knight "Butchery" in spell script for 4.3.4
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp22
-rw-r--r--src/server/game/Spells/SpellMgr.cpp4
2 files changed, 2 insertions, 24 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index ea89d869785..75668bc3b3a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -5912,20 +5912,6 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
triggered_spell_id = 24406;
break;
}
- case 2236: // Thrill of the Hunt
- {
- if (!procSpell)
- return false;
-
- basepoints0 = CalculatePct(procSpell->CalcPowerCost(this, SpellSchoolMask(procSpell->SchoolMask)), triggerAmount);
-
- if (basepoints0 <= 0)
- return false;
-
- target = this;
- triggered_spell_id = 34720;
- break;
- }
}
break;
}
@@ -6511,14 +6497,6 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
triggered_spell_id = dummySpell->Effects[effIndex].TriggerSpell;
break;
}
- // Butchery
- if (dummySpell->SpellIconID == 2664)
- {
- basepoints0 = triggerAmount;
- triggered_spell_id = 50163;
- target = this;
- break;
- }
// Dancing Rune Weapon
if (dummySpell->Id == 49028)
{
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 284b45eb8be..cedafc08883 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3093,8 +3093,8 @@ void SpellMgr::LoadSpellInfoCorrections()
case 20336:
case 20337:
case 63320: // Glyph of Life Tap
- case 53228: // Rapid Killing (Rang 1)
- case 53232: // Rapid Killing (Rang 2)
+ case 53228: // Rapid Killing (Rank 1)
+ case 53232: // Rapid Killing (Rank 2)
// Entries were not updated after spell effect change, we have to do that manually :/
spellInfo->AttributesEx3 |= SPELL_ATTR3_CAN_PROC_WITH_TRIGGERED;
break;