Merge branch 'master' of github.com:TrinityCore/TrinityCore

This commit is contained in:
Shauren
2011-07-23 00:23:27 +02:00
5 changed files with 4 additions and 64 deletions

View File

@@ -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