1 files changed, 13 insertions, 0 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index ea4f49767f9..567653f2be7 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -165,6 +165,9 @@ bool Condition::Meets(Player * player, Unit* invoker)
         case CONDITION_SPELL:
             condMeets = player->HasSpell(mConditionValue1);
             break;
+        case CONDITION_NOITEM:
+            condMeets = !player->HasItemCount(mConditionValue1, 1, mConditionValue2 ? true : false);
+            break;
         default:
             condMeets = false;
             refId = 0;
@@ -1249,6 +1252,16 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
                 sLog.outErrorDb("Spell condition has useless data in value2 (%u)!", cond->mConditionValue2);
             break;
         }
+        case CONDITION_NOITEM:
+        {
+            ItemPrototype const *proto = sObjectMgr.GetItemPrototype(cond->mConditionValue1);
+            if (!proto)
+            {
+                sLog.outErrorDb("NoItem condition has non existing item (%u), skipped", cond->mConditionValue1);
+                return false;
+            }
+            break;
+        }
         case CONDITION_AREAID:
         case CONDITION_INSTANCE_DATA:
             break;