diff options
author | QAston <qaston@gmail.com> | 2011-09-03 20:16:15 +0200 |
---|---|---|
committer | QAston <qaston@gmail.com> | 2011-09-03 20:16:15 +0200 |
commit | ddacd0de9442897ec2e11b49b4f3ae548797d575 (patch) | |
tree | 2736579c85ae842f05838c42041cafbec499c0ca /src/server/game/Spells/SpellInfo.cpp | |
parent | 43052a47e1ed941d6eddb5e29cc5c66376ca830b (diff) | |
parent | 2d4e4644a49356e76f759246e469c762ccb74bcf (diff) |
Core/Spells: Fix pick lock - thanks to cyberbrest for pointing the reason of this issue.
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
-rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 04e90d2083b..3e374b62cd1 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1721,13 +1721,14 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, Unit const* target, b return SPELL_CAST_OK; } -SpellCastResult SpellInfo::CheckExplicitTarget(Unit const* caster, WorldObject const* target) const +SpellCastResult SpellInfo::CheckExplicitTarget(Unit const* caster, WorldObject const* target, Item const* itemTarget) const { uint32 neededTargets = GetExplicitTargetMask(); if (!target) { if (neededTargets & (TARGET_FLAG_UNIT_MASK | TARGET_FLAG_GAMEOBJECT_MASK | TARGET_FLAG_CORPSE_MASK)) - return SPELL_FAILED_BAD_TARGETS; + if (!(neededTargets & TARGET_FLAG_GAMEOBJECT_ITEM) || !itemTarget) + return SPELL_FAILED_BAD_TARGETS; return SPELL_CAST_OK; } |