Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-28 12:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Conditions: Drop hacky/nonworking CONDITION_AD_COMMISSION_AURA (10). Condition data with this condition type needs to use CONDITION_AURA (1) to function properly.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-10-02 22:24:02 +02:00
parent b90c5d6760
commit 27e2a98920
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Conditions/ConditionMgr.cpp
View File

@@ -98,18 +98,6 @@ bool Condition::Meets(Player * player, Unit* invoker)
condMeets = (status == QUEST_STATUS_NONE);
break;
}
case CONDITION_AD_COMMISSION_AURA:
{
Unit::AuraApplicationMap const& auras = player->GetAppliedAuras();
for (Unit::AuraApplicationMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
if ((itr->second->GetBase()->GetSpellProto()->Attributes & (SPELL_ATTR_UNK4 | SPELL_ATTR_CASTABLE_WHILE_MOUNTED)) && itr->second->GetBase()->GetSpellProto()->SpellVisual[0] == 3580)
{
condMeets = true;
break;
}
condMeets = false;
break;
}
case CONDITION_NO_AURA:
condMeets = !player->HasAuraEffect(mConditionValue1, mConditionValue2);
break;

2
src/server/game/Conditions/ConditionMgr.h
View File

@@ -39,7 +39,7 @@ enum ConditionType
CONDITION_SKILL = 7, // skill_id skill_value +referenceID true if has skill_value for skill_id
CONDITION_QUESTREWARDED = 8, // quest_id 0 +referenceID true if quest_id was rewarded before
CONDITION_QUESTTAKEN = 9, // quest_id 0, +referenceID true while quest active
CONDITION_AD_COMMISSION_AURA = 10, // 0 0, +referenceID true while one from AD commission aura active
CONDITION_UNUSED_1 = 10, // currently unused
CONDITION_NO_AURA = 11, // spell_id effindex +referenceID true if does not have aura of spell_id with effect effindex
CONDITION_ACTIVE_EVENT = 12, // event_id 0 +referenceID true if event is active
CONDITION_INSTANCE_DATA = 13, // entry data +referenceID true if data is set in current instance