aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-04-29 16:51:27 -0500
committermegamage <none@none>2009-04-29 16:51:27 -0500
commite490779de0b741839599a5924a3cc536ef4e763d (patch)
tree05a88af3ce96e79d25daddf9587fdf313a860ef1 /src/game/Player.cpp
parentb89d307f758915252670b7392d58b0181f9d5429 (diff)
parente695016e94c08fbef0f2e2df4df13fd27f0c86ef (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index e17afc32fd9..a3751ea2345 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17251,6 +17251,9 @@ void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs )
if (spellInfo->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE)
continue;
+ if(spellInfo->PreventionType != SPELL_PREVENTION_TYPE_SILENCE)
+ continue;
+
if((idSchoolMask & GetSpellSchoolMask(spellInfo)) && GetSpellCooldownDelay(unSpellId) < unTimeMs )
{
data << unSpellId;