diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-07-23 00:23:27 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-07-23 00:23:27 +0200 |
| commit | bd45e59e9fcf82e46a3faf9530cf74a43ec6e474 (patch) | |
| tree | 54167519c65d1d67503e8b44910505491b7bbeeb /src/server/scripts | |
| parent | 18d4daf5394ad83c64e24b34b334da2743eebdd1 (diff) | |
| parent | a0f1a5c78900037827e46ef82277cc293a39e0bd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 6d2818e507c..acf92d3a984 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -775,7 +775,7 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_AIR_RIFLE_HOLD_VISUAL, true); // needed because this spell shares GCD with its triggered spells (which must not be cast with triggered flag) if (Player* player = GetCaster()->ToPlayer()) - player->RemoveGlobalCooldown(GetSpellInfo()); + player->GetGlobalCooldownMgr().CancelGlobalCooldown(GetSpellInfo()); if (urand(0, 4)) GetCaster()->CastSpell(GetHitUnit(), SPELL_AIR_RIFLE_SHOOT, false); else |