Core/Db/Conditions: Prepare conditions system to work on objects of different type than players.

Warning: API has changed a bit:
ConditionScript::OnConditionCheck(Condition* condition, Player* player, Unit* invoker) is now
ConditionScript::OnConditionCheck(Condition* condition, WorldObject* object, WorldObject* invoker)

10 files changed, 166 insertions, 94 deletions

diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp
index 6ce8ce330cf..d8def36f999 100755
--- a/src/server/game/AI/CoreAI/CombatAI.cpp
+++ b/src/server/game/AI/CoreAI/CombatAI.cpp
@@ -326,7 +326,7 @@ void VehicleAI::CheckConditions(const uint32 diff)
                 {
                     if (Player* player = passenger->ToPlayer())
                     {
-                        if (!sConditionMgr->IsPlayerMeetToConditions(player, conditions))
+                        if (!sConditionMgr->IsObjectMeetToConditions(player, conditions))
                         {
                             player->ExitVehicle();
                             return;//check other pessanger in next tick
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index a6923ea19e0..42a23236182 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -90,7 +90,7 @@ void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint3
                 if (Player* player = unit->ToPlayer())
                 {
                     ConditionList conds = sConditionMgr->GetConditionsForSmartEvent((*i).entryOrGuid, (*i).event_id, (*i).source_type);
-                    meets = sConditionMgr->IsPlayerMeetToConditions(player, conds);
+                    meets = sConditionMgr->IsObjectMeetToConditions(player, conds);
                 }
             }
             
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 964abe6ae57..81db61171a3 100755
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -27,14 +27,15 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
-// Checks if player meets the condition
+// Checks if object meets the condition
 // Can have CONDITION_SOURCE_TYPE_NONE && !mReferenceId if called from a special event (ie: eventAI)
-bool Condition::Meets(Player* player, Unit* invoker)
+bool Condition::Meets(WorldObject* object, WorldObject* invoker)
 {
-    if (!player)
+    // object not present, return false
+    if (!object)
     {
-        sLog->outDebug(LOG_FILTER_CONDITIONSYS, "Condition player not found");
-        return false;                                       // player not present, return false
+        sLog->outDebug(LOG_FILTER_CONDITIONSYS, "Condition object not found");
+        return false;
     }
     uint32 refId = mConditionValue3;//value 3 can be a 'quick' reference
     bool condMeets = false;
@@ -45,72 +46,119 @@ bool Condition::Meets(Player* player, Unit* invoker)
             condMeets = true;                                    // empty condition, always met
             break;
         case CONDITION_AURA:
-            refId = 0;
-            if (!mConditionValue3)
-                condMeets = player->HasAuraEffect(mConditionValue1, mConditionValue2);
-            else if (Unit* target = player->GetSelectedUnit())
-                condMeets = target->HasAuraEffect(mConditionValue1, mConditionValue2);
+        {
+            if (Unit* unit = object->ToUnit())
+            {
+                refId = 0;
+                if (!mConditionValue3)
+                    condMeets = unit->HasAuraEffect(mConditionValue1, mConditionValue2);
+                else if (Player* player = unit->ToPlayer())
+                {
+                    if (Unit* target = player->GetSelectedUnit())
+                        condMeets = target->HasAuraEffect(mConditionValue1, mConditionValue2);
+                }
+            }
             break;
+        }
         case CONDITION_ITEM:
-            condMeets = (mConditionValue2 && player->HasItemCount(mConditionValue1, mConditionValue2)) || (!mConditionValue2 && !player->HasItemCount(mConditionValue1, mConditionValue2));//HasItemCount returns false if 0 count is used
+        {
+            if (Player* player = object->ToPlayer())
+                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);
+        {
+            if (Player* player = object->ToPlayer())
+                condMeets = player->HasItemOrGemWithIdEquipped(mConditionValue1, 1);
             break;
+        }
         case CONDITION_ZONEID:
-            condMeets = player->GetZoneId() == mConditionValue1;
+            condMeets = object->GetZoneId() == mConditionValue1;
             break;
         case CONDITION_REPUTATION_RANK:
         {
-            if (FactionEntry const* faction = sFactionStore.LookupEntry(mConditionValue1))
-                condMeets = (mConditionValue2 & (1 << player->GetReputationMgr().GetRank(faction)));
+            if (Player* player = object->ToPlayer())
+            {
+                if (FactionEntry const* faction = sFactionStore.LookupEntry(mConditionValue1))
+                    condMeets = (mConditionValue2 & (1 << player->GetReputationMgr().GetRank(faction)));
+            }
             break;
         }
         case CONDITION_ACHIEVEMENT:
-            condMeets = player->GetAchievementMgr().HasAchieved(mConditionValue1);
+        {
+            if (Player* player = object->ToPlayer())
+                condMeets = player->GetAchievementMgr().HasAchieved(mConditionValue1);
             break;
+        }
         case CONDITION_TEAM:
-            condMeets = player->GetTeam() == mConditionValue1;
+        {
+            if (Player* player = object->ToPlayer())
+                condMeets = player->GetTeam() == mConditionValue1;
             break;
+        }
         case CONDITION_CLASS:
-            condMeets = player->getClassMask() & mConditionValue1;
+        {
+            if (Player* player = object->ToPlayer())
+                condMeets = player->getClassMask() & mConditionValue1;
             break;
+        }
         case CONDITION_RACE:
-            condMeets = player->getRaceMask() & mConditionValue1;
+        {
+            if (Player* player = object->ToPlayer())
+                condMeets = player->getRaceMask() & mConditionValue1;
             break;
+        }
         case CONDITION_SKILL:
-            condMeets = player->HasSkill(mConditionValue1) && player->GetBaseSkillValue(mConditionValue1) >= mConditionValue2;
+        {
+            if (Player* player = object->ToPlayer())
+                condMeets = player->HasSkill(mConditionValue1) && player->GetBaseSkillValue(mConditionValue1) >= mConditionValue2;
             break;
+        }
         case CONDITION_QUESTREWARDED:
-            condMeets = (player->GetQuestRewardStatus(mConditionValue1) == !mConditionValue2);
+        {
+            if (Player* player = object->ToPlayer())
+                condMeets = (player->GetQuestRewardStatus(mConditionValue1) == !mConditionValue2);
             break;
+        }
         case CONDITION_QUESTTAKEN:
         {
-            QuestStatus status = player->GetQuestStatus(mConditionValue1);
-            condMeets = ((status == QUEST_STATUS_INCOMPLETE) == !mConditionValue2);
+            if (Player* player = object->ToPlayer())
+            {
+                QuestStatus status = player->GetQuestStatus(mConditionValue1);
+                condMeets = ((status == QUEST_STATUS_INCOMPLETE) == !mConditionValue2);
+            }
             break;
         }
         case CONDITION_QUEST_COMPLETE:
         {
-            QuestStatus status = player->GetQuestStatus(mConditionValue1);
-            condMeets = ((status == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(mConditionValue1)) == !mConditionValue2);
+            if (Player* player = object->ToPlayer())
+            {
+                QuestStatus status = player->GetQuestStatus(mConditionValue1);
+                condMeets = ((status == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(mConditionValue1)) == !mConditionValue2);
+            }
             break;
         }
         case CONDITION_QUEST_NONE:
         {
-            QuestStatus status = player->GetQuestStatus(mConditionValue1);
-            condMeets = ((status == QUEST_STATUS_NONE) == !mConditionValue2);
+            if (Player* player = object->ToPlayer())
+            {
+                QuestStatus status = player->GetQuestStatus(mConditionValue1);
+                condMeets = ((status == QUEST_STATUS_NONE) == !mConditionValue2);
+            }
             break;
         }
         case CONDITION_NO_AURA:
-            condMeets = !player->HasAuraEffect(mConditionValue1, mConditionValue2);
+        {
+            if (Unit* unit = object->ToUnit())
+                condMeets = !unit->HasAuraEffect(mConditionValue1, mConditionValue2);
             break;
+        }
         case CONDITION_ACTIVE_EVENT:
             condMeets = sGameEventMgr->IsActiveEvent(mConditionValue1);
             break;
         case CONDITION_INSTANCE_DATA:
         {
-            Map* map = player->GetMap();
+            Map* map = object->GetMap();
             if (map && map->IsDungeon() && ((InstanceMap*)map)->GetInstanceScript())
                 condMeets = ((InstanceMap*)map)->GetInstanceScript()->GetData(mConditionValue1) == mConditionValue2;
             break;
@@ -121,32 +169,41 @@ bool Condition::Meets(Player* player, Unit* invoker)
             break;
         case CONDITION_CREATURE_TARGET:
         {
-            Unit* target = player->GetSelectedUnit();
-            if (target)
-                if (Creature* cTarget = target->ToCreature())
-                    if (cTarget->GetEntry() == mConditionValue1)
-                        condMeets = true;
+            if (Player* player = object->ToPlayer())
+            {
+                Unit* target = player->GetSelectedUnit();
+                if (target)
+                    if (Creature* cTarget = target->ToCreature())
+                        if (cTarget->GetEntry() == mConditionValue1)
+                            condMeets = true;
+            }
             break;
         }
         case CONDITION_TARGET_HEALTH_BELOW_PCT:
         {
-            Unit* target = player->GetSelectedUnit();
-            if (target)
-                condMeets = !target->HealthAbovePct(mConditionValue1);
-            break;
+            if (Player* player = object->ToPlayer())
+            {
+                Unit* target = player->GetSelectedUnit();
+                if (target)
+                    condMeets = !target->HealthAbovePct(mConditionValue1);
+                break;
+            }
         }
         case CONDITION_TARGET_RANGE:
         {
-            if (Unit* target = player->GetSelectedUnit())
-                if (player->GetDistance(target) >= mConditionValue1 && (!mConditionValue2 || player->GetDistance(target) <= mConditionValue2))
-                    condMeets = true;
+            if (Player* player = object->ToPlayer())
+            {
+                if (Unit* target = player->GetSelectedUnit())
+                    if (player->GetDistance(target) >= mConditionValue1 && (!mConditionValue2 || player->GetDistance(target) <= mConditionValue2))
+                        condMeets = true;
+            }
             break;
         }
         case CONDITION_MAPID:
-            condMeets = player->GetMapId() == mConditionValue1;
+            condMeets = object->GetMapId() == mConditionValue1;
             break;
         case CONDITION_AREAID:
-            condMeets = player->GetAreaId() == mConditionValue1;
+            condMeets = object->GetAreaId() == mConditionValue1;
             break;
         case CONDITION_ITEM_TARGET:
         {
@@ -155,49 +212,61 @@ bool Condition::Meets(Player* player, Unit* invoker)
             break;
         }
         case CONDITION_SPELL:
-            if (mConditionValue2 == 1)
-                condMeets = player->HasSpell(mConditionValue1);
-            else
-                condMeets = !player->HasSpell(mConditionValue1);
+        {
+            if (Player* player = object->ToPlayer())
+            {
+                if (mConditionValue2 == 1)
+                    condMeets = player->HasSpell(mConditionValue1);
+                else
+                    condMeets = !player->HasSpell(mConditionValue1);
+            }
             break;
+        }
         case CONDITION_NOITEM:
-            condMeets = !player->HasItemCount(mConditionValue1, 1, mConditionValue2 ? true : false);
+        {
+            if (Player* player = object->ToPlayer())
+                condMeets = !player->HasItemCount(mConditionValue1, 1, mConditionValue2 ? true : false);
             break;
+        }
         case CONDITION_LEVEL:
         {
-            switch (mConditionValue2)
+            if (Unit* unit = object->ToUnit())
             {
-                case LVL_COND_EQ:
-                    condMeets = player->getLevel() == mConditionValue1;
-                    break;
-                case LVL_COND_HIGH:
-                    condMeets = player->getLevel() > mConditionValue1;
-                    break;
-                case LVL_COND_LOW:
-                    condMeets = player->getLevel() < mConditionValue1;
-                    break;
-                case LVL_COND_HIGH_EQ:
-                    condMeets = player->getLevel() >= mConditionValue1;
-                    break;
-                case LVL_COND_LOW_EQ:
-                    condMeets = player->getLevel() <= mConditionValue1;
-                    break;
+                switch (mConditionValue2)
+                {
+                    case LVL_COND_EQ:
+                        condMeets = unit->getLevel() == mConditionValue1;
+                        break;
+                    case LVL_COND_HIGH:
+                        condMeets = unit->getLevel() > mConditionValue1;
+                        break;
+                    case LVL_COND_LOW:
+                        condMeets = unit->getLevel() < mConditionValue1;
+                        break;
+                    case LVL_COND_HIGH_EQ:
+                        condMeets = unit->getLevel() >= mConditionValue1;
+                        break;
+                    case LVL_COND_LOW_EQ:
+                        condMeets = unit->getLevel() <= mConditionValue1;
+                        break;
+                }
             }
             break;
         }
         case CONDITION_DRUNKENSTATE:
         {
-            condMeets = (uint32)Player::GetDrunkenstateByValue(player->GetDrunkValue()) >= mConditionValue1;
+            if (Player* player = object->ToPlayer())
+                condMeets = (uint32)Player::GetDrunkenstateByValue(player->GetDrunkValue()) >= mConditionValue1;
             break;
         }
         case CONDITION_NEAR_CREATURE:
         {
-            condMeets = GetClosestCreatureWithEntry(player, mConditionValue1, (float)mConditionValue2) ? true : false;
+            condMeets = GetClosestCreatureWithEntry(object, mConditionValue1, (float)mConditionValue2) ? true : false;
             break;
         }
         case CONDITION_NEAR_GAMEOBJECT:
         {
-            condMeets = GetClosestGameObjectWithEntry(player, mConditionValue1, (float)mConditionValue2) ? true : false;
+            condMeets = GetClosestGameObjectWithEntry(object, mConditionValue1, (float)mConditionValue2) ? true : false;
             break;
         }
         default:
@@ -222,15 +291,16 @@ bool Condition::Meets(Player* player, Unit* invoker)
     if (condMeets && refId)//only have to check references if 'this' is met
     {
         ConditionList ref = sConditionMgr->GetConditionReferences(refId);
-        refMeets = sConditionMgr->IsPlayerMeetToConditions(player, ref, invoker);
+        refMeets = sConditionMgr->IsObjectMeetToConditions(object, ref, invoker);
     }
     else
         refMeets = true;
 
-    if (sendErrorMsg && ErrorTextd && (!condMeets || !refMeets))//send special error from DB
-        player->m_ConditionErrorMsgId = ErrorTextd;
+    if (Player* player = object->ToPlayer())
+        if (sendErrorMsg && ErrorTextd && (!condMeets || !refMeets))//send special error from DB
+            player->m_ConditionErrorMsgId = ErrorTextd;
 
-    bool script = sScriptMgr->OnConditionCheck(this, player, invoker); // Returns true by default.
+    bool script = sScriptMgr->OnConditionCheck(this, object, invoker); // Returns true by default.
     return condMeets && refMeets && script;
 }
 
@@ -252,7 +322,7 @@ ConditionList ConditionMgr::GetConditionReferences(uint32 refId)
     return conditions;
 }
 
-bool ConditionMgr::IsPlayerMeetToConditionList(Player* player, ConditionList const& conditions, Unit* invoker /*= NULL*/)
+bool ConditionMgr::IsObjectMeetToConditionList(WorldObject* object, ConditionList const& conditions, WorldObject* invoker /*= NULL*/)
 {
     std::map<uint32, bool> ElseGroupStore;
     for (ConditionList::const_iterator i = conditions.begin(); i != conditions.end(); ++i)
@@ -271,7 +341,7 @@ bool ConditionMgr::IsPlayerMeetToConditionList(Player* player, ConditionList con
                 ConditionReferenceContainer::const_iterator ref = ConditionReferenceStore.find((*i)->mReferenceId);
                 if (ref != ConditionReferenceStore.end())
                 {
-                    if (!IsPlayerMeetToConditionList(player, (*ref).second, invoker))
+                    if (!IsObjectMeetToConditionList(object, (*ref).second, invoker))
                         ElseGroupStore[(*i)->mElseGroup] = false;
                 }
                 else
@@ -283,7 +353,7 @@ bool ConditionMgr::IsPlayerMeetToConditionList(Player* player, ConditionList con
             }
             else //handle normal condition
             {
-                if (!(*i)->Meets(player, invoker))
+                if (!(*i)->Meets(object, invoker))
                     ElseGroupStore[(*i)->mElseGroup] = false;
             }
         }
@@ -295,16 +365,18 @@ bool ConditionMgr::IsPlayerMeetToConditionList(Player* player, ConditionList con
     return false;
 }
 
-bool ConditionMgr::IsPlayerMeetToConditions(Player* player, ConditionList const& conditions, Unit* invoker /*= NULL*/)
+bool ConditionMgr::IsObjectMeetToConditions(WorldObject* object, ConditionList const& conditions, WorldObject* invoker /*= NULL*/)
 {
     if (conditions.empty())
         return true;
 
+    Player* player = object ? object->ToPlayer() : NULL;
+
     if (player)
         player->m_ConditionErrorMsgId = 0;
 
     sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsPlayerMeetToConditions");
-    bool result = IsPlayerMeetToConditionList(player, conditions, invoker);
+    bool result = IsObjectMeetToConditionList(player, conditions, invoker);
 
     if (player && player->m_ConditionErrorMsgId && player->GetSession() && !result)
         player->GetSession()->SendNotification(player->m_ConditionErrorMsgId);  //m_ConditionErrorMsgId is set only if a condition was not met
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 4e371997d73..b3ba27db7b5 100755
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -132,7 +132,7 @@ struct Condition
         mNegativeCondition  = false;
     }
 
-    bool Meets(Player* player, Unit* invoker = NULL);
+    bool Meets(WorldObject* player, WorldObject* invoker = NULL);
     bool isLoaded() const { return mConditionType > CONDITION_NONE || mReferenceId; }
 };
 
@@ -157,7 +157,7 @@ class ConditionMgr
         bool isConditionTypeValid(Condition* cond);
         ConditionList GetConditionReferences(uint32 refId);
 
-        bool IsPlayerMeetToConditions(Player* player, ConditionList const& conditions, Unit* invoker = NULL);
+        bool IsObjectMeetToConditions(WorldObject* object, ConditionList const& conditions, WorldObject* invoker = NULL);
         ConditionList GetConditionsForNotGroupedEntry(ConditionSourceType sourceType, uint32 entry);
         ConditionList GetConditionsForSmartEvent(int32 entryOrGuid, uint32 eventId, uint32 sourceType);
         ConditionList GetConditionsForVehicleSpell(uint32 creatureID, uint32 spellID);
@@ -167,7 +167,7 @@ class ConditionMgr
         bool addToLootTemplate(Condition* cond, LootTemplate* loot);
         bool addToGossipMenus(Condition* cond);
         bool addToGossipMenuItems(Condition* cond);
-        bool IsPlayerMeetToConditionList(Player* player, ConditionList const& conditions, Unit* invoker = NULL);
+        bool IsObjectMeetToConditionList(WorldObject* player, ConditionList const& conditions, WorldObject* invoker = NULL);
 
         bool isGroupable(ConditionSourceType sourceType) const
         {
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 38af97f61cb..c6ea26a2dfd 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -14088,7 +14088,7 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool
     for (GossipMenuItemsMap::const_iterator itr = menuItemBounds.first; itr != menuItemBounds.second; ++itr)
     {
         bool canTalk = true;
-        if (!sConditionMgr->IsPlayerMeetToConditions(this, itr->second.Conditions))
+        if (!sConditionMgr->IsObjectMeetToConditions(this, itr->second.Conditions))
             continue;
 
         if (source->GetTypeId() == TYPEID_UNIT)
@@ -14390,7 +14390,7 @@ uint32 Player::GetGossipTextId(uint32 menuId)
     GossipMenusMapBounds menuBounds = sObjectMgr->GetGossipMenusMapBounds(menuId);
 
     for (GossipMenusMap::const_iterator itr = menuBounds.first; itr != menuBounds.second; ++itr)
-        if (sConditionMgr->IsPlayerMeetToConditions(this, itr->second.conditions))
+        if (sConditionMgr->IsObjectMeetToConditions(this, itr->second.conditions))
             textId = itr->second.text_id;
 
     return textId;
@@ -15378,7 +15378,7 @@ bool Player::SatisfyQuestStatus(Quest const* qInfo, bool msg)
 bool Player::SatisfyQuestConditions(Quest const* qInfo, bool msg)
 {
     ConditionList conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_QUEST_ACCEPT, qInfo->GetQuestId());
-    if (!sConditionMgr->IsPlayerMeetToConditions(this, conditions))
+    if (!sConditionMgr->IsObjectMeetToConditions(this, conditions))
     {
         if (msg)
             SendCanTakeQuestResponse(INVALIDREASON_DONT_HAVE_REQ);
@@ -19861,7 +19861,7 @@ void Player::VehicleSpellInitialize()
         }
 
         ConditionList conditions = sConditionMgr->GetConditionsForVehicleSpell(veh->GetEntry(), spellId);
-        if (!sConditionMgr->IsPlayerMeetToConditions(this, conditions))
+        if (!sConditionMgr->IsObjectMeetToConditions(this, conditions))
         {
             sLog->outDebug(LOG_FILTER_CONDITIONSYS, "VehicleSpellInitialize: conditions not met for Vehicle entry %u spell %u", veh->ToCreature()->GetEntry(), spellId);
             data << uint16(0) << uint8(0) << uint8(i+8);
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index f9aa40cdcda..05d945d3a93 100755
--- a/src/server/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
@@ -651,7 +651,7 @@ uint32 WorldSession::getDialogStatus(Player* player, Object* questgiver, uint32
         if (!pQuest) continue;
 
         ConditionList conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK, pQuest->GetQuestId());
-        if (!sConditionMgr->IsPlayerMeetToConditions(player, conditions))
+        if (!sConditionMgr->IsObjectMeetToConditions(player, conditions))
             continue;
 
         QuestStatus status = player->GetQuestStatus(quest_id);
@@ -679,7 +679,7 @@ uint32 WorldSession::getDialogStatus(Player* player, Object* questgiver, uint32
             continue;
 
         ConditionList conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK, pQuest->GetQuestId());
-        if (!sConditionMgr->IsPlayerMeetToConditions(player, conditions))
+        if (!sConditionMgr->IsObjectMeetToConditions(player, conditions))
             continue;
 
         QuestStatus status = player->GetQuestStatus(quest_id);
diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
index c9e8f68af52..89c13dd6b5c 100755
--- a/src/server/game/Loot/LootMgr.cpp
+++ b/src/server/game/Loot/LootMgr.cpp
@@ -341,7 +341,7 @@ LootItem::LootItem(LootStoreItem const& li)
 bool LootItem::AllowedForPlayer(Player const* player) const
 {
     // DB conditions check
-    if (!sConditionMgr->IsPlayerMeetToConditions(const_cast<Player*>(player), conditions))
+    if (!sConditionMgr->IsObjectMeetToConditions(const_cast<Player*>(player), conditions))
         return false;
 
     ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(itemid);
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index d5e8f71e1fd..eccf12aa7e1 100755
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1036,14 +1036,14 @@ void ScriptMgr::OnAuctionExpire(AuctionHouseObject* ah, AuctionEntry* entry)
     FOREACH_SCRIPT(AuctionHouseScript)->OnAuctionExpire(ah, entry);
 }
 
-bool ScriptMgr::OnConditionCheck(Condition* condition, Player* player, Unit* invoker)
+bool ScriptMgr::OnConditionCheck(Condition* condition, WorldObject* object, WorldObject* invoker)
 {
     ASSERT(condition);
-    ASSERT(player);
+    ASSERT(object);
     // invoker can be NULL.
 
     GET_SCRIPT_RET(ConditionScript, condition->mScriptId, tmpscript, true);
-    return tmpscript->OnConditionCheck(condition, player, invoker);
+    return tmpscript->OnConditionCheck(condition, object, invoker);
 }
 
 void ScriptMgr::OnInstall(Vehicle* veh)
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 60052bea0ea..853db564a6d 100755
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -572,7 +572,7 @@ class ConditionScript : public ScriptObject
         bool IsDatabaseBound() const { return true; }
 
         // Called when a single condition is checked for a player.
-        virtual bool OnConditionCheck(Condition* /*condition*/, Player* /*player*/, Unit* /*invoker*/) { return true; }
+        virtual bool OnConditionCheck(Condition* /*condition*/, WorldObject* /*object*/, WorldObject* /*invoker*/) { return true; }
 };
 
 class VehicleScript : public ScriptObject
@@ -938,7 +938,7 @@ class ScriptMgr
 
     public: /* ConditionScript */
 
-        bool OnConditionCheck(Condition* condition, Player* player, Unit* invoker);
+        bool OnConditionCheck(Condition* condition, WorldObject* object, WorldObject* invoker);
 
     public: /* VehicleScript */
 
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 45cf64266e1..9dccb0ff341 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -4720,7 +4720,7 @@ SpellCastResult Spell::CheckCast(bool strict)
     if (Player* plrCaster = m_caster->GetCharmerOrOwnerPlayerOrPlayerItself())
     {
         ConditionList conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_SPELL, m_spellInfo->Id);
-        if (!conditions.empty() && !sConditionMgr->IsPlayerMeetToConditions(plrCaster, conditions))
+        if (!conditions.empty() && !sConditionMgr->IsObjectMeetToConditions(plrCaster, conditions))
             return SPELL_FAILED_DONT_REPORT;
     }