Core/Conditions: Optimizations part 3 removed copying condition containers all over the place
This commit is contained in:
Shauren
@@ -259,7 +259,7 @@ void TurretAI::UpdateAI(uint32 /*diff*/)
|
||||
// VehicleAI
|
||||
//////////////
|
||||
|
||||
VehicleAI::VehicleAI(Creature* creature) : CreatureAI(creature), m_ConditionsTimer(VEHICLE_CONDITION_CHECK_TIME)
|
||||
VehicleAI::VehicleAI(Creature* creature) : CreatureAI(creature), m_HasConditions(false), m_ConditionsTimer(VEHICLE_CONDITION_CHECK_TIME)
|
||||
{
|
||||
LoadConditions();
|
||||
m_DoDismiss = false;
|
||||
@@ -285,7 +285,7 @@ void VehicleAI::UpdateAI(uint32 diff)
|
||||
|
||||
void VehicleAI::OnCharmed(bool apply)
|
||||
{
|
||||
if (!me->GetVehicleKit()->IsVehicleInUse() && !apply && !conditions.empty()) // was used and has conditions
|
||||
if (!me->GetVehicleKit()->IsVehicleInUse() && !apply && m_HasConditions) // was used and has conditions
|
||||
{
|
||||
m_DoDismiss = true; // needs reset
|
||||
}
|
||||
@@ -297,16 +297,14 @@ void VehicleAI::OnCharmed(bool apply)
|
||||
|
||||
void VehicleAI::LoadConditions()
|
||||
{
|
||||
conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE, me->GetEntry());
|
||||
if (!conditions.empty())
|
||||
TC_LOG_DEBUG("condition", "VehicleAI::LoadConditions: loaded %u conditions", uint32(conditions.size()));
|
||||
m_HasConditions = sConditionMgr->HasConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE, me->GetEntry());
|
||||
}
|
||||
|
||||
void VehicleAI::CheckConditions(uint32 diff)
|
||||
{
|
||||
if (m_ConditionsTimer < diff)
|
||||
{
|
||||
if (!conditions.empty())
|
||||
if (m_HasConditions)
|
||||
{
|
||||
if (Vehicle* vehicleKit = me->GetVehicleKit())
|
||||
for (SeatMap::iterator itr = vehicleKit->Seats.begin(); itr != vehicleKit->Seats.end(); ++itr)
|
||||
@@ -314,7 +312,7 @@ void VehicleAI::CheckConditions(uint32 diff)
|
||||
{
|
||||
if (Player* player = passenger->ToPlayer())
|
||||
{
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(player, me, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE, me->GetEntry(), player, me))
|
||||
{
|
||||
player->ExitVehicle();
|
||||
return; // check other pessanger in next tick
|
||||
|
||||
@@ -112,7 +112,7 @@ struct VehicleAI : public CreatureAI
|
||||
private:
|
||||
void LoadConditions();
|
||||
void CheckConditions(uint32 diff);
|
||||
ConditionContainer conditions;
|
||||
bool m_HasConditions;
|
||||
uint32 m_ConditionsTimer;
|
||||
bool m_DoDismiss;
|
||||
uint32 m_DismissTimer;
|
||||
|
||||
@@ -89,13 +89,8 @@ void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint3
|
||||
continue;
|
||||
|
||||
if (eventType == e /*&& (!i->event.event_phase_mask || IsInPhase(i->event.event_phase_mask)) && !(i->event.event_flags & SMART_EVENT_FLAG_NOT_REPEATABLE && i->runOnce)*/)
|
||||
{
|
||||
ConditionContainer conds = sConditionMgr->GetConditionsForSmartEvent(i->entryOrGuid, i->event_id, i->source_type);
|
||||
ConditionSourceInfo info = ConditionSourceInfo(unit, GetBaseObject());
|
||||
|
||||
if (sConditionMgr->IsObjectMeetToConditions(info, conds))
|
||||
if (sConditionMgr->IsObjectMeetingSmartEventConditions(i->entryOrGuid, i->event_id, i->source_type, unit, GetBaseObject()))
|
||||
ProcessEvent(*i, unit, var0, var1, bvar, spell, gob);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2354,10 +2349,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
|
||||
|
||||
void SmartScript::ProcessTimedAction(SmartScriptHolder& e, uint32 const& min, uint32 const& max, Unit* unit, uint32 var0, uint32 var1, bool bvar, const SpellInfo* spell, GameObject* gob)
|
||||
{
|
||||
ConditionContainer const conds = sConditionMgr->GetConditionsForSmartEvent(e.entryOrGuid, e.event_id, e.source_type);
|
||||
ConditionSourceInfo info = ConditionSourceInfo(unit, GetBaseObject());
|
||||
|
||||
if (sConditionMgr->IsObjectMeetToConditions(info, conds))
|
||||
if (sConditionMgr->IsObjectMeetingSmartEventConditions(e.entryOrGuid, e.event_id, e.source_type, unit, GetBaseObject()))
|
||||
ProcessAction(e, unit, var0, var1, bvar, spell, gob);
|
||||
|
||||
RecalcTimer(e, min, max);
|
||||
|
||||
@@ -678,41 +678,41 @@ ConditionMgr::~ConditionMgr()
|
||||
Clean();
|
||||
}
|
||||
|
||||
uint32 ConditionMgr::GetSearcherTypeMaskForConditionList(ConditionContainer const& conditions)
|
||||
uint32 ConditionMgr::GetSearcherTypeMaskForConditionList(ConditionContainer const& conditions) const
|
||||
{
|
||||
if (conditions.empty())
|
||||
return GRID_MAP_TYPE_MASK_ALL;
|
||||
// groupId, typeMask
|
||||
std::map<uint32, uint32> ElseGroupStore;
|
||||
std::map<uint32, uint32> elseGroupSearcherTypeMasks;
|
||||
for (ConditionContainer::const_iterator i = conditions.begin(); i != conditions.end(); ++i)
|
||||
{
|
||||
// no point of having not loaded conditions in list
|
||||
ASSERT((*i)->isLoaded() && "ConditionMgr::GetSearcherTypeMaskForConditionList - not yet loaded condition found in list");
|
||||
std::map<uint32, uint32>::const_iterator itr = ElseGroupStore.find((*i)->ElseGroup);
|
||||
std::map<uint32, uint32>::const_iterator itr = elseGroupSearcherTypeMasks.find((*i)->ElseGroup);
|
||||
// group not filled yet, fill with widest mask possible
|
||||
if (itr == ElseGroupStore.end())
|
||||
ElseGroupStore[(*i)->ElseGroup] = GRID_MAP_TYPE_MASK_ALL;
|
||||
if (itr == elseGroupSearcherTypeMasks.end())
|
||||
elseGroupSearcherTypeMasks[(*i)->ElseGroup] = GRID_MAP_TYPE_MASK_ALL;
|
||||
// no point of checking anymore, empty mask
|
||||
else if (!(*itr).second)
|
||||
else if (!itr->second)
|
||||
continue;
|
||||
|
||||
if ((*i)->ReferenceId) // handle reference
|
||||
{
|
||||
ConditionReferenceContainer::const_iterator ref = ConditionReferenceStore.find((*i)->ReferenceId);
|
||||
ASSERT(ref != ConditionReferenceStore.end() && "ConditionMgr::GetSearcherTypeMaskForConditionList - incorrect reference");
|
||||
ElseGroupStore[(*i)->ElseGroup] &= GetSearcherTypeMaskForConditionList((*ref).second);
|
||||
elseGroupSearcherTypeMasks[(*i)->ElseGroup] &= GetSearcherTypeMaskForConditionList((*ref).second);
|
||||
}
|
||||
else // handle normal condition
|
||||
{
|
||||
// object will match conditions in one ElseGroupStore only when it matches all of them
|
||||
// so, let's find a smallest possible mask which satisfies all conditions
|
||||
ElseGroupStore[(*i)->ElseGroup] &= (*i)->GetSearcherTypeMaskForCondition();
|
||||
elseGroupSearcherTypeMasks[(*i)->ElseGroup] &= (*i)->GetSearcherTypeMaskForCondition();
|
||||
}
|
||||
}
|
||||
// object will match condition when one of the checks in ElseGroupStore is matching
|
||||
// so, let's include all possible masks
|
||||
uint32 mask = 0;
|
||||
for (std::map<uint32, uint32>::const_iterator i = ElseGroupStore.begin(); i != ElseGroupStore.end(); ++i)
|
||||
for (std::map<uint32, uint32>::const_iterator i = elseGroupSearcherTypeMasks.begin(); i != elseGroupSearcherTypeMasks.end(); ++i)
|
||||
mask |= i->second;
|
||||
|
||||
return mask;
|
||||
@@ -721,43 +721,43 @@ uint32 ConditionMgr::GetSearcherTypeMaskForConditionList(ConditionContainer cons
|
||||
bool ConditionMgr::IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo, ConditionContainer const& conditions) const
|
||||
{
|
||||
// groupId, groupCheckPassed
|
||||
std::map<uint32, bool> ElseGroupStore;
|
||||
for (ConditionContainer::const_iterator i = conditions.begin(); i != conditions.end(); ++i)
|
||||
std::map<uint32, bool> elseGroupStore;
|
||||
for (Condition const* condition : conditions)
|
||||
{
|
||||
TC_LOG_DEBUG("condition", "ConditionMgr::IsPlayerMeetToConditionList %s val1: %u", (*i)->ToString().c_str(), (*i)->ConditionValue1);
|
||||
if ((*i)->isLoaded())
|
||||
TC_LOG_DEBUG("condition", "ConditionMgr::IsPlayerMeetToConditionList %s val1: %u", condition->ToString().c_str(), condition->ConditionValue1);
|
||||
if (condition->isLoaded())
|
||||
{
|
||||
//! Find ElseGroup in ElseGroupStore
|
||||
std::map<uint32, bool>::const_iterator itr = ElseGroupStore.find((*i)->ElseGroup);
|
||||
std::map<uint32, bool>::const_iterator itr = elseGroupStore.find(condition->ElseGroup);
|
||||
//! If not found, add an entry in the store and set to true (placeholder)
|
||||
if (itr == ElseGroupStore.end())
|
||||
ElseGroupStore[(*i)->ElseGroup] = true;
|
||||
if (itr == elseGroupStore.end())
|
||||
elseGroupStore[condition->ElseGroup] = true;
|
||||
else if (!(*itr).second)
|
||||
continue;
|
||||
|
||||
if ((*i)->ReferenceId)//handle reference
|
||||
if (condition->ReferenceId)//handle reference
|
||||
{
|
||||
ConditionReferenceContainer::const_iterator ref = ConditionReferenceStore.find((*i)->ReferenceId);
|
||||
ConditionReferenceContainer::const_iterator ref = ConditionReferenceStore.find(condition->ReferenceId);
|
||||
if (ref != ConditionReferenceStore.end())
|
||||
{
|
||||
if (!IsObjectMeetToConditionList(sourceInfo, (*ref).second))
|
||||
ElseGroupStore[(*i)->ElseGroup] = false;
|
||||
if (!IsObjectMeetToConditionList(sourceInfo, ref->second))
|
||||
elseGroupStore[condition->ElseGroup] = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
TC_LOG_DEBUG("condition", "ConditionMgr::IsPlayerMeetToConditionList %s Reference template -%u not found",
|
||||
(*i)->ToString().c_str(), (*i)->ReferenceId); // checked at loading, should never happen
|
||||
condition->ToString().c_str(), condition->ReferenceId); // checked at loading, should never happen
|
||||
}
|
||||
|
||||
}
|
||||
else //handle normal condition
|
||||
{
|
||||
if (!(*i)->Meets(sourceInfo))
|
||||
ElseGroupStore[(*i)->ElseGroup] = false;
|
||||
if (!condition->Meets(sourceInfo))
|
||||
elseGroupStore[condition->ElseGroup] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (std::map<uint32, bool>::const_iterator i = ElseGroupStore.begin(); i != ElseGroupStore.end(); ++i)
|
||||
for (std::map<uint32, bool>::const_iterator i = elseGroupStore.begin(); i != elseGroupStore.end(); ++i)
|
||||
if (i->second)
|
||||
return true;
|
||||
|
||||
@@ -814,87 +814,121 @@ bool ConditionMgr::CanHaveSourceIdSet(ConditionSourceType sourceType)
|
||||
return (sourceType == CONDITION_SOURCE_TYPE_SMART_EVENT);
|
||||
}
|
||||
|
||||
ConditionContainer ConditionMgr::GetConditionsForNotGroupedEntry(ConditionSourceType sourceType, uint32 entry) const
|
||||
bool ConditionMgr::IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, ConditionSourceInfo& sourceInfo) const
|
||||
{
|
||||
if (sourceType > CONDITION_SOURCE_TYPE_NONE && sourceType < CONDITION_SOURCE_TYPE_MAX)
|
||||
{
|
||||
ConditionEntriesByTypeMap::const_iterator itr = ConditionStore.find(sourceType);
|
||||
if (itr != ConditionStore.end())
|
||||
{
|
||||
ConditionsByEntryMap::const_iterator i = itr->second.find(entry);
|
||||
if (i != itr->second.end())
|
||||
{
|
||||
TC_LOG_DEBUG("condition", "GetConditionsForNotGroupedEntry: found conditions for type %u and entry %u", uint32(sourceType), entry);
|
||||
return IsObjectMeetToConditions(sourceInfo, i->second);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ConditionMgr::IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, WorldObject* target0, WorldObject* target1 /*= nullptr*/, WorldObject* target2 /*= nullptr*/) const
|
||||
{
|
||||
ConditionSourceInfo conditionSource(target0, target1, target2);
|
||||
return IsObjectMeetingNotGroupedConditions(sourceType, entry, conditionSource);
|
||||
}
|
||||
|
||||
bool ConditionMgr::HasConditionsForNotGroupedEntry(ConditionSourceType sourceType, uint32 entry) const
|
||||
{
|
||||
ConditionContainer spellCond;
|
||||
if (sourceType > CONDITION_SOURCE_TYPE_NONE && sourceType < CONDITION_SOURCE_TYPE_MAX)
|
||||
{
|
||||
ConditionEntriesByTypeMap::const_iterator itr = ConditionStore.find(sourceType);
|
||||
if (itr != ConditionStore.end())
|
||||
{
|
||||
ConditionsByEntryMap::const_iterator i = (*itr).second.find(entry);
|
||||
if (i != (*itr).second.end())
|
||||
{
|
||||
spellCond = (*i).second;
|
||||
TC_LOG_DEBUG("condition", "GetConditionsForNotGroupedEntry: found conditions for type %u and entry %u", uint32(sourceType), entry);
|
||||
}
|
||||
}
|
||||
if (itr->second.find(entry) != itr->second.end())
|
||||
return true;
|
||||
}
|
||||
return spellCond;
|
||||
return false;
|
||||
}
|
||||
|
||||
ConditionContainer ConditionMgr::GetConditionsForSpellClickEvent(uint32 creatureId, uint32 spellId) const
|
||||
bool ConditionMgr::IsObjectMeetingSpellClickConditions(uint32 creatureId, uint32 spellId, WorldObject* clicker, WorldObject* target) const
|
||||
{
|
||||
ConditionContainer cond;
|
||||
ConditionEntriesByCreatureIdMap::const_iterator itr = SpellClickEventConditionStore.find(creatureId);
|
||||
if (itr != SpellClickEventConditionStore.end())
|
||||
{
|
||||
ConditionsByEntryMap::const_iterator i = (*itr).second.find(spellId);
|
||||
if (i != (*itr).second.end())
|
||||
ConditionsByEntryMap::const_iterator i = itr->second.find(spellId);
|
||||
if (i != itr->second.end())
|
||||
{
|
||||
cond = (*i).second;
|
||||
TC_LOG_DEBUG("condition", "GetConditionsForSpellClickEvent: found conditions for SpellClickEvent entry %u spell %u", creatureId, spellId);
|
||||
ConditionSourceInfo sourceInfo(clicker, target);
|
||||
return IsObjectMeetToConditions(sourceInfo, i->second);
|
||||
}
|
||||
}
|
||||
return cond;
|
||||
return true;
|
||||
}
|
||||
|
||||
ConditionContainer ConditionMgr::GetConditionsForVehicleSpell(uint32 creatureId, uint32 spellId) const
|
||||
ConditionContainer const* ConditionMgr::GetConditionsForSpellClickEvent(uint32 creatureId, uint32 spellId) const
|
||||
{
|
||||
ConditionEntriesByCreatureIdMap::const_iterator itr = SpellClickEventConditionStore.find(creatureId);
|
||||
if (itr != SpellClickEventConditionStore.end())
|
||||
{
|
||||
ConditionsByEntryMap::const_iterator i = itr->second.find(spellId);
|
||||
if (i != itr->second.end())
|
||||
{
|
||||
TC_LOG_DEBUG("condition", "GetConditionsForSpellClickEvent: found conditions for SpellClickEvent entry %u spell %u", creatureId, spellId);
|
||||
return &i->second;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool ConditionMgr::IsObjectMeetingVehicleSpellConditions(uint32 creatureId, uint32 spellId, Player* player, Unit* vehicle) const
|
||||
{
|
||||
ConditionContainer cond;
|
||||
ConditionEntriesByCreatureIdMap::const_iterator itr = VehicleSpellConditionStore.find(creatureId);
|
||||
if (itr != VehicleSpellConditionStore.end())
|
||||
{
|
||||
ConditionsByEntryMap::const_iterator i = (*itr).second.find(spellId);
|
||||
if (i != (*itr).second.end())
|
||||
ConditionsByEntryMap::const_iterator i = itr->second.find(spellId);
|
||||
if (i != itr->second.end())
|
||||
{
|
||||
cond = (*i).second;
|
||||
TC_LOG_DEBUG("condition", "GetConditionsForVehicleSpell: found conditions for Vehicle entry %u spell %u", creatureId, spellId);
|
||||
ConditionSourceInfo sourceInfo(player, vehicle);
|
||||
return IsObjectMeetToConditions(sourceInfo, i->second);
|
||||
}
|
||||
}
|
||||
return cond;
|
||||
return true;
|
||||
}
|
||||
|
||||
ConditionContainer ConditionMgr::GetConditionsForSmartEvent(int64 entryOrGuid, uint32 eventId, uint32 sourceType) const
|
||||
bool ConditionMgr::IsObjectMeetingSmartEventConditions(int64 entryOrGuid, uint32 eventId, uint32 sourceType, Unit* unit, WorldObject* baseObject) const
|
||||
{
|
||||
ConditionContainer cond;
|
||||
SmartEventConditionContainer::const_iterator itr = SmartEventConditionStore.find(std::make_pair(entryOrGuid, sourceType));
|
||||
if (itr != SmartEventConditionStore.end())
|
||||
{
|
||||
ConditionsByEntryMap::const_iterator i = (*itr).second.find(eventId + 1);
|
||||
if (i != (*itr).second.end())
|
||||
ConditionsByEntryMap::const_iterator i = itr->second.find(eventId + 1);
|
||||
if (i != itr->second.end())
|
||||
{
|
||||
cond = (*i).second;
|
||||
TC_LOG_DEBUG("condition", "GetConditionsForSmartEvent: found conditions for Smart Event entry or guid " SI64FMTD " eventId %u", entryOrGuid, eventId);
|
||||
ConditionSourceInfo sourceInfo(unit, baseObject);
|
||||
return IsObjectMeetToConditions(sourceInfo, i->second);
|
||||
}
|
||||
}
|
||||
return cond;
|
||||
return true;
|
||||
}
|
||||
|
||||
ConditionContainer ConditionMgr::GetConditionsForNpcVendorEvent(uint32 creatureId, uint32 itemId) const
|
||||
bool ConditionMgr::IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32 itemId, Player* player, Creature* vendor) const
|
||||
{
|
||||
ConditionContainer cond;
|
||||
ConditionEntriesByCreatureIdMap::const_iterator itr = NpcVendorConditionContainerStore.find(creatureId);
|
||||
if (itr != NpcVendorConditionContainerStore.end())
|
||||
{
|
||||
ConditionsByEntryMap::const_iterator i = (*itr).second.find(itemId);
|
||||
if (i != (*itr).second.end())
|
||||
{
|
||||
cond = (*i).second;
|
||||
TC_LOG_DEBUG("condition", "GetConditionsForNpcVendorEvent: found conditions for creature entry %u item %u", creatureId, itemId);
|
||||
ConditionSourceInfo sourceInfo(player, vendor);
|
||||
return IsObjectMeetToConditions(sourceInfo, i->second);
|
||||
}
|
||||
}
|
||||
return cond;
|
||||
return true;
|
||||
}
|
||||
|
||||
void ConditionMgr::LoadConditions(bool isReload)
|
||||
@@ -1757,7 +1791,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) const
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ConditionMgr::isConditionTypeValid(Condition* cond)
|
||||
bool ConditionMgr::isConditionTypeValid(Condition* cond) const
|
||||
{
|
||||
if (cond->ConditionType == CONDITION_NONE || cond->ConditionType >= CONDITION_MAX)
|
||||
{
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "Common.h"
|
||||
|
||||
class Creature;
|
||||
class Player;
|
||||
class Unit;
|
||||
class WorldObject;
|
||||
@@ -256,19 +257,22 @@ class ConditionMgr
|
||||
}
|
||||
|
||||
void LoadConditions(bool isReload = false);
|
||||
bool isConditionTypeValid(Condition* cond);
|
||||
bool isConditionTypeValid(Condition* cond) const;
|
||||
|
||||
uint32 GetSearcherTypeMaskForConditionList(ConditionContainer const& conditions);
|
||||
uint32 GetSearcherTypeMaskForConditionList(ConditionContainer const& conditions) const;
|
||||
bool IsObjectMeetToConditions(WorldObject* object, ConditionContainer const& conditions) const;
|
||||
bool IsObjectMeetToConditions(WorldObject* object1, WorldObject* object2, ConditionContainer const& conditions) const;
|
||||
bool IsObjectMeetToConditions(ConditionSourceInfo& sourceInfo, ConditionContainer const& conditions) const;
|
||||
static bool CanHaveSourceGroupSet(ConditionSourceType sourceType);
|
||||
static bool CanHaveSourceIdSet(ConditionSourceType sourceType);
|
||||
ConditionContainer GetConditionsForNotGroupedEntry(ConditionSourceType sourceType, uint32 entry) const;
|
||||
ConditionContainer GetConditionsForSpellClickEvent(uint32 creatureId, uint32 spellId) const;
|
||||
ConditionContainer GetConditionsForSmartEvent(int64 entryOrGuid, uint32 eventId, uint32 sourceType) const;
|
||||
ConditionContainer GetConditionsForVehicleSpell(uint32 creatureId, uint32 spellId) const;
|
||||
ConditionContainer GetConditionsForNpcVendorEvent(uint32 creatureId, uint32 itemId) const;
|
||||
bool IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, ConditionSourceInfo& sourceInfo) const;
|
||||
bool IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, WorldObject* target0, WorldObject* target1 = nullptr, WorldObject* target2 = nullptr) const;
|
||||
bool HasConditionsForNotGroupedEntry(ConditionSourceType sourceType, uint32 entry) const;
|
||||
bool IsObjectMeetingSpellClickConditions(uint32 creatureId, uint32 spellId, WorldObject* clicker, WorldObject* target) const;
|
||||
ConditionContainer const* GetConditionsForSpellClickEvent(uint32 creatureId, uint32 spellId) const;
|
||||
bool IsObjectMeetingVehicleSpellConditions(uint32 creatureId, uint32 spellId, Player* player, Unit* vehicle) const;
|
||||
bool IsObjectMeetingSmartEventConditions(int64 entryOrGuid, uint32 eventId, uint32 sourceType, Unit* unit, WorldObject* baseObject) const;
|
||||
bool IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32 itemId, Player* player, Creature* vendor) const;
|
||||
|
||||
struct ConditionTypeInfo
|
||||
{
|
||||
|
||||
@@ -15047,8 +15047,7 @@ bool Player::SatisfyQuestStatus(Quest const* qInfo, bool msg)
|
||||
|
||||
bool Player::SatisfyQuestConditions(Quest const* qInfo, bool msg)
|
||||
{
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_QUEST_ACCEPT, qInfo->GetQuestId());
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(this, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_QUEST_ACCEPT, qInfo->GetQuestId(), this))
|
||||
{
|
||||
if (msg)
|
||||
{
|
||||
@@ -15449,8 +15448,7 @@ QuestGiverStatus Player::GetQuestDialogStatus(Object* questgiver)
|
||||
if (!quest)
|
||||
continue;
|
||||
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK, quest->GetQuestId());
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(this, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK, quest->GetQuestId(), this))
|
||||
continue;
|
||||
|
||||
QuestStatus status = GetQuestStatus(questId);
|
||||
@@ -15477,8 +15475,7 @@ QuestGiverStatus Player::GetQuestDialogStatus(Object* questgiver)
|
||||
if (!quest)
|
||||
continue;
|
||||
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK, quest->GetQuestId());
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(this, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK, quest->GetQuestId(), this))
|
||||
continue;
|
||||
|
||||
QuestStatus status = GetQuestStatus(questId);
|
||||
@@ -20373,8 +20370,7 @@ void Player::VehicleSpellInitialize()
|
||||
continue;
|
||||
}
|
||||
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForVehicleSpell(vehicle->GetEntry(), spellId);
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(this, vehicle, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingVehicleSpellConditions(vehicle->GetEntry(), spellId, this, vehicle))
|
||||
{
|
||||
TC_LOG_DEBUG("condition", "VehicleSpellInitialize: conditions not met for Vehicle entry %u spell %u", vehicle->ToCreature()->GetEntry(), spellId);
|
||||
data << uint16(0) << uint8(0) << uint8(i+8);
|
||||
@@ -21365,8 +21361,7 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorguid, uint32 vendorslot, uin
|
||||
return false;
|
||||
}
|
||||
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForNpcVendorEvent(creature->GetEntry(), item);
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(this, creature, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingVendorItemConditions(creature->GetEntry(), item, this, creature))
|
||||
{
|
||||
TC_LOG_DEBUG("condition", "BuyItemFromVendor: conditions not met for creature entry %u item %u", creature->GetEntry(), item);
|
||||
SendBuyError(BUY_ERR_CANT_FIND_ITEM, creature, item, 0);
|
||||
@@ -23305,16 +23300,18 @@ void Player::UpdateForQuestWorldObjects()
|
||||
{
|
||||
//! This code doesn't look right, but it was logically converted to condition system to do the exact
|
||||
//! same thing it did before. It definitely needs to be overlooked for intended functionality.
|
||||
ConditionContainer conds = sConditionMgr->GetConditionsForSpellClickEvent(obj->GetEntry(), _itr->second.spellId);
|
||||
bool buildUpdateBlock = false;
|
||||
for (ConditionContainer::const_iterator jtr = conds.begin(); jtr != conds.end() && !buildUpdateBlock; ++jtr)
|
||||
if ((*jtr)->ConditionType == CONDITION_QUESTREWARDED || (*jtr)->ConditionType == CONDITION_QUESTTAKEN)
|
||||
buildUpdateBlock = true;
|
||||
|
||||
if (buildUpdateBlock)
|
||||
if (ConditionContainer const* conds = sConditionMgr->GetConditionsForSpellClickEvent(obj->GetEntry(), _itr->second.spellId))
|
||||
{
|
||||
obj->BuildValuesUpdateBlockForPlayer(&udata, this);
|
||||
break;
|
||||
bool buildUpdateBlock = false;
|
||||
for (ConditionContainer::const_iterator jtr = conds->begin(); jtr != conds->end() && !buildUpdateBlock; ++jtr)
|
||||
if ((*jtr)->ConditionType == CONDITION_QUESTREWARDED || (*jtr)->ConditionType == CONDITION_QUESTTAKEN)
|
||||
buildUpdateBlock = true;
|
||||
|
||||
if (buildUpdateBlock)
|
||||
{
|
||||
obj->BuildValuesUpdateBlockForPlayer(&udata, this);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25075,9 +25072,7 @@ bool Player::CanSeeSpellClickOn(Creature const* c) const
|
||||
if (!itr->second.IsFitToRequirements(this, c))
|
||||
return false;
|
||||
|
||||
ConditionContainer conds = sConditionMgr->GetConditionsForSpellClickEvent(c->GetEntry(), itr->second.spellId);
|
||||
ConditionSourceInfo info = ConditionSourceInfo(const_cast<Player*>(this), const_cast<Creature*>(c));
|
||||
if (sConditionMgr->IsObjectMeetToConditions(info, conds))
|
||||
if (sConditionMgr->IsObjectMeetingSpellClickConditions(c->GetEntry(), itr->second.spellId, const_cast<Player*>(this), const_cast<Creature*>(c)))
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -12303,9 +12303,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
|
||||
continue;
|
||||
|
||||
// do checks using conditions table
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_SPELL_PROC, spellProto->Id);
|
||||
ConditionSourceInfo condInfo = ConditionSourceInfo(eventInfo.GetActor(), eventInfo.GetActionTarget());
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(condInfo, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_SPELL_PROC, spellProto->Id, eventInfo.GetActor(), eventInfo.GetActionTarget()))
|
||||
continue;
|
||||
|
||||
// AuraScript Hook
|
||||
@@ -15210,9 +15208,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId)
|
||||
continue;
|
||||
|
||||
//! Check database conditions
|
||||
ConditionContainer conds = sConditionMgr->GetConditionsForSpellClickEvent(spellClickEntry, itr->second.spellId);
|
||||
ConditionSourceInfo info = ConditionSourceInfo(clicker, this);
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(info, conds))
|
||||
if (!sConditionMgr->IsObjectMeetingSpellClickConditions(spellClickEntry, itr->second.spellId, clicker, this))
|
||||
continue;
|
||||
|
||||
Unit* caster = (itr->second.castFlags & NPC_CLICK_CAST_CASTER_CLICKER) ? clicker : this;
|
||||
|
||||
@@ -598,8 +598,7 @@ void WorldSession::SendListInventory(ObjectGuid vendorGuid)
|
||||
continue;
|
||||
}
|
||||
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForNpcVendorEvent(vendor->GetEntry(), vendorItem->item);
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(_player, vendor, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingVendorItemConditions(vendor->GetEntry(), vendorItem->item, _player, vendor))
|
||||
{
|
||||
TC_LOG_DEBUG("condition", "SendListInventory: conditions not met for creature entry %u item %u", vendor->GetEntry(), vendorItem->item);
|
||||
continue;
|
||||
|
||||
@@ -1037,7 +1037,7 @@ void ScriptMgr::OnAuctionExpire(AuctionHouseObject* ah, AuctionEntry* entry)
|
||||
FOREACH_SCRIPT(AuctionHouseScript)->OnAuctionExpire(ah, entry);
|
||||
}
|
||||
|
||||
bool ScriptMgr::OnConditionCheck(Condition* condition, ConditionSourceInfo& sourceInfo)
|
||||
bool ScriptMgr::OnConditionCheck(Condition const* condition, ConditionSourceInfo& sourceInfo)
|
||||
{
|
||||
ASSERT(condition);
|
||||
|
||||
|
||||
@@ -602,7 +602,7 @@ class ConditionScript : public ScriptObject
|
||||
bool IsDatabaseBound() const final override { return true; }
|
||||
|
||||
// Called when a single condition is checked for a player.
|
||||
virtual bool OnConditionCheck(Condition* /*condition*/, ConditionSourceInfo& /*sourceInfo*/) { return true; }
|
||||
virtual bool OnConditionCheck(Condition const* /*condition*/, ConditionSourceInfo& /*sourceInfo*/) { return true; }
|
||||
};
|
||||
|
||||
class VehicleScript : public ScriptObject
|
||||
@@ -1029,7 +1029,7 @@ class ScriptMgr
|
||||
|
||||
public: /* ConditionScript */
|
||||
|
||||
bool OnConditionCheck(Condition* condition, ConditionSourceInfo& sourceInfo);
|
||||
bool OnConditionCheck(Condition const* condition, ConditionSourceInfo& sourceInfo);
|
||||
|
||||
public: /* VehicleScript */
|
||||
|
||||
|
||||
@@ -1855,9 +1855,7 @@ bool Aura::IsProcTriggeredOnEvent(AuraApplication* aurApp, ProcEventInfo& eventI
|
||||
return false;
|
||||
|
||||
// do checks using conditions table
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_SPELL_PROC, GetId());
|
||||
ConditionSourceInfo condInfo = ConditionSourceInfo(eventInfo.GetActor(), eventInfo.GetActionTarget());
|
||||
if (!sConditionMgr->IsObjectMeetToConditions(condInfo, conditions))
|
||||
if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_SPELL_PROC, GetId(), eventInfo.GetActor(), eventInfo.GetActionTarget()))
|
||||
return false;
|
||||
|
||||
// AuraScript Hook
|
||||
|
||||
@@ -4821,10 +4821,8 @@ SpellCastResult Spell::CheckCast(bool strict)
|
||||
|
||||
// check spell cast conditions from database
|
||||
{
|
||||
ConditionSourceInfo condInfo = ConditionSourceInfo(m_caster);
|
||||
condInfo.mConditionTargets[1] = m_targets.GetObjectTarget();
|
||||
ConditionContainer conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_SPELL, m_spellInfo->Id);
|
||||
if (!conditions.empty() && !sConditionMgr->IsObjectMeetToConditions(condInfo, conditions))
|
||||
ConditionSourceInfo condInfo = ConditionSourceInfo(m_caster, m_targets.GetObjectTarget());
|
||||
if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_SPELL, m_spellInfo->Id, condInfo))
|
||||
{
|
||||
// mLastFailedCondition can be NULL if there was an error processing the condition in Condition::Meets (i.e. wrong data for ConditionTarget or others)
|
||||
if (condInfo.mLastFailedCondition && condInfo.mLastFailedCondition->ErrorType)
|
||||
|
||||
Reference in New Issue
Block a user