Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/WorldStates: Migrate conditions and criteria to new worldstate api

Browse Source
This commit is contained in:
Shauren authored and Ovahlord committed 2022-10-08 23:18:03 +02:00
1 parent 2521489e2b
commit 0461bdc730
2 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Conditions/ConditionMgr.cpp
+3 -2
View File
@@ -27,13 +27,14 @@
#include "Map.h"
#include "ObjectMgr.h"
#include "PhasingHandler.h"
#include "Player.h"
#include "Pet.h"
#include "Player.h"
#include "ReputationMgr.h"
#include "ScriptMgr.h"
#include "SpellAuras.h"
#include "SpellMgr.h"
#include "World.h"
#include "WorldStateMgr.h"
char const* const ConditionMgr::StaticSourceTypeData[CONDITION_SOURCE_TYPE_MAX] =
{
@@ -410,7 +411,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_WORLD_STATE:
{
condMeets = ConditionValue2 == sWorld->getWorldState(ConditionValue1);
condMeets = sWorldStateMgr->GetValue(ConditionValue1, object->GetMap()) == int32(ConditionValue2);
break;
}
case CONDITION_PHASEID:
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -7182,7 +7182,7 @@ void Player::UpdateHostileAreaState(AreaTableEntry const* area)
{
if (area)
{
if (InBattleground() || area->Flags & AREA_FLAG_COMBAT || (area->PvpCombatWorldStateID != -1 && sWorld->getWorldState(area->PvpCombatWorldStateID) != 0))
if (InBattleground() || area->Flags & AREA_FLAG_COMBAT || (area->PvpCombatWorldStateID != -1 && sWorldStateMgr->GetValue(area->PvpCombatWorldStateID, GetMap()) != 0))
pvpInfo.IsInHostileArea = true;
else if (sWorld->IsPvPRealm() || (area->Flags & AREA_FLAG_UNK3))
{