diff options
author | Drahy <none@none> | 2009-07-07 02:23:41 +0200 |
---|---|---|
committer | Drahy <none@none> | 2009-07-07 02:23:41 +0200 |
commit | a3f00be577f33e41d70ce0c9b0e9e0951d5dc082 (patch) | |
tree | 1d98d3e898b6e4888eef99cb09ea0a4eca8cd1a7 /src/game/Unit.cpp | |
parent | a68d8302d54b8d119006f0c5e9fe346e5d0baf24 (diff) | |
parent | af1c18852446e6be81376a98eba8e2543985479d (diff) |
* Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r-- | src/game/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 95efd29dc48..bdef7cb2d71 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7792,9 +7792,9 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig // Sword and Board case 50227: { - // remove cooldown of Shield Slam + // Remove cooldown on Shield Slam if (GetTypeId()==TYPEID_PLAYER) - ((Player*)this)->RemoveCategoryCooldown(1209); + ((Player*)this)->RemoveSpellCategoryCooldown(1209, true); break; } case 63375: // Improved Stormstrike |