Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Handlers/BattleGroundHandler.cpp
This commit is contained in:
commit
a0c8193ee7
30 files changed
+1056
-330
No files matched your search
@@ -5469,6 +5469,9 @@ SpellCastResult Spell::CheckCast(bool strict)
|
||||
|
||||
if (target->GetCharmerGUID())
|
||||
return SPELL_FAILED_CHARMED;
|
||||
|
||||
if (target->GetOwner() && target->GetOwner()->GetTypeId() == TYPEID_PLAYER)
|
||||
return SPELL_FAILED_TARGET_IS_PLAYER_CONTROLLED;
|
||||
|
||||
int32 damage = CalculateDamage(i, target);
|
||||
if (damage && int32(target->getLevel()) > damage)
|
||||
|
||||
Reference in new issue
Block a user