Core/Units: Use spellclick conditions in Player::canSeeSpellClickOn

2012-02-21 10:17:32 +01:00
parent 4e8218025e
commit 44195689b9
1 changed files with 10 additions and 3 deletions
@@ -24152,10 +24152,17 @@ bool Player::canSeeSpellClickOn(Creature const* c) const
        return true;

    for (SpellClickInfoContainer::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
-        if (itr->second.IsFitToRequirements(this, c))
-            return true;
-
+    {
+        if (!itr->second.IsFitToRequirements(this, c))
            return false;
+
+        ConditionList conds = sConditionMgr->GetConditionsForSpellClickEvent(c->GetEntry(), itr->second.spellId);
+        ConditionSourceInfo info = ConditionSourceInfo(const_cast<Player*>(this), const_cast<Creature*>(c));
+        if (!sConditionMgr->IsObjectMeetToConditions(info, conds))
+            return false;
+    }
+
+    return true;
 }

 void Player::BuildPlayerTalentsInfoData(WorldPacket* data)