aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRat <none@none>2010-11-15 23:20:20 +0100
committerRat <none@none>2010-11-15 23:20:20 +0100
commit9abf7f98b3516c91cb589461d47f64788c666392 (patch)
treebff1803642e15e25c7f44d8ea4b9269ade462170 /src
parent171ffd49ed9bc9b9970f4ab5576ae406027df4e8 (diff)
Core/Conditions: updated CONDITION_ITEM, it should work with 0 item count
--HG-- branch : trunk
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Conditions/ConditionMgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 7565451b2a7..f035a9456ef 100755
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -54,7 +54,7 @@ bool Condition::Meets(Player * player, Unit* invoker)
condMeets = target->HasAuraEffect(mConditionValue1, mConditionValue2);
break;
case CONDITION_ITEM:
- condMeets = player->HasItemCount(mConditionValue1, mConditionValue2);
+ condMeets = (mConditionValue2 && player->HasItemCount(mConditionValue1, mConditionValue2)) || (!mConditionValue2 && !player->HasItemCount(mConditionValue1, mConditionValue2));//HasItemCount returns false if 0 count is used
break;
case CONDITION_ITEM_EQUIPPED:
condMeets = player->HasItemOrGemWithIdEquipped(mConditionValue1,1);