Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps
This commit is contained in:
commit
9dc2b7ecd5
77 files changed
+2991
-2223
No files matched your search
@@ -5229,7 +5229,7 @@ SpellCastResult Spell::CheckCast(bool strict)
|
||||
if (m_spellInfo->Id != 1842 || (m_targets.GetGOTarget() &&
|
||||
m_targets.GetGOTarget()->GetGOInfo()->type != GAMEOBJECT_TYPE_TRAP))
|
||||
if (m_caster->ToPlayer()->InBattleground() && // In Battleground players can use only flags and banners
|
||||
!m_caster->ToPlayer()->CanUseBattlegroundObject())
|
||||
!m_caster->ToPlayer()->CanUseBattlegroundObject(m_targets.GetGOTarget()))
|
||||
return SPELL_FAILED_TRY_AGAIN;
|
||||
|
||||
// get the lock entry
|
||||
@@ -5640,7 +5640,7 @@ SpellCastResult Spell::CheckCasterAuras() const
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (foundNotStun)
|
||||
if (foundNotStun && m_spellInfo->Id != 22812)
|
||||
prevented_reason = SPELL_FAILED_STUNNED;
|
||||
}
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user