Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Taxi: Implemented PlayerCondition requirements on taxi paths

Browse Source
This commit is contained in:
Shauren
2016-06-08 21:46:08 +02:00
parent 7eceba09d7
commit de2efe0105
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2368,7 +2368,7 @@ inline bool PlayerConditionLogic(uint32 logic, std::array<bool, N>& results)
return result;
}
bool ConditionMgr::IsPlayerMeetingCondition(Player* player, PlayerConditionEntry const* condition)
bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditionEntry const* condition)
{
if (condition->MinLevel && player->getLevel() < condition->MinLevel)
return false;
@@ -2489,7 +2489,7 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player* player, PlayerConditionEntry
if (condition->PartyStatus)
{
Group* group = player->GetGroup();
Group const* group = player->GetGroup();
switch (condition->PartyStatus)
{
case 1:

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

@@ -271,7 +271,7 @@ class TC_GAME_API ConditionMgr
bool IsObjectMeetingSmartEventConditions(int64 entryOrGuid, uint32 eventId, uint32 sourceType, Unit* unit, WorldObject* baseObject) const;
bool IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32 itemId, Player* player, Creature* vendor) const;
static bool IsPlayerMeetingCondition(Player* player, PlayerConditionEntry const* condition);
static bool IsPlayerMeetingCondition(Player const* player, PlayerConditionEntry const* condition);
struct ConditionTypeInfo
{

5
src/server/game/Entities/Taxi/TaxiPathGraph.cpp
View File

@@ -185,8 +185,9 @@ uint32 TaxiPathGraph::EdgeCost::EvaluateDistance(Player const* player) const
if (!(To->Flags & requireFlag))
return std::numeric_limits<uint16>::max();
//if (To->ConditionID && !player->MeetsCondition(To->ConditionID))
// return std::numeric_limits<uint16>::max();
if (PlayerConditionEntry const* condition = sPlayerConditionStore.LookupEntry(To->ConditionID))
if (!sConditionMgr->IsPlayerMeetingCondition(player, condition))
return std::numeric_limits<uint16>::max();
return Distance;
}