Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Disables: Added DISABLE_TYPE_PHASE_AREA (#29997)

Browse Source 
(cherry picked from commit 3aae692ec3)
This commit is contained in:
ModoX
2024-06-04 00:44:47 +02:00
committed by Ovahlord
parent 2855d26c64
commit 25f308adb6
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,6 +241,17 @@ void LoadDisables()
TC_LOG_INFO("misc", "Pathfinding disabled for {} map {}.", MapTypeNames[mapEntry->InstanceType], entry);
break;
}
case DISABLE_TYPE_PHASE_AREA:
{
if (!sPhaseStore.LookupEntry(entry))
{
TC_LOG_ERROR("sql.sql", "Phase entry {} from `disables` doesn't exist in dbc, skipped.", entry);
continue;
}
if (flags)
TC_LOG_ERROR("sql.sql", "Disable flags specified for phase {}, useless data.", entry);
break;
}
default:
break;
}
@@ -383,6 +394,7 @@ bool IsDisabledFor(DisableType type, uint32 entry, WorldObject const* ref, uint8
case DISABLE_TYPE_OUTDOORPVP:
case DISABLE_TYPE_CRITERIA:
case DISABLE_TYPE_MMAP:
case DISABLE_TYPE_PHASE_AREA:
return true;
case DISABLE_TYPE_VMAP:
return (flags & itr->second.flags) != 0;

1
src/server/game/Conditions/DisableMgr.h
View File

@@ -33,6 +33,7 @@ enum DisableType
DISABLE_TYPE_VMAP = 6,
DISABLE_TYPE_MMAP = 7,
DISABLE_TYPE_LFG_MAP = 8,
DISABLE_TYPE_PHASE_AREA = 9,
MAX_DISABLE_TYPES
};

8
src/server/game/Phasing/PhasingHandler.cpp
View File

@@ -20,6 +20,7 @@
#include "ConditionMgr.h"
#include "Creature.h"
#include "DB2Stores.h"
#include "DisableMgr.h"
#include "Language.h"
#include "Map.h"
#include "MiscPackets.h"
@@ -318,6 +319,9 @@ void PhasingHandler::OnAreaChange(WorldObject* object)
continue;
uint32 phaseId = phaseArea.PhaseInfo->Id;
if (DisableMgr::IsDisabledFor(DISABLE_TYPE_PHASE_AREA, phaseId, object))
continue;
if (sConditionMgr->IsObjectMeetToConditions(srcInfo, phaseArea.Conditions))
phaseShift.AddPhase(phaseId, GetPhaseFlags(phaseId), &phaseArea.Conditions);
else
@@ -388,7 +392,7 @@ bool PhasingHandler::OnConditionChange(WorldObject* object, bool updateVisibilit
for (auto itr = suppressedPhaseShift.Phases.begin(); itr != suppressedPhaseShift.Phases.end();)
{
if (sConditionMgr->IsObjectMeetToConditions(srcInfo, *ASSERT_NOTNULL(itr->AreaConditions)))
if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_PHASE_AREA, itr->Id, object) && sConditionMgr->IsObjectMeetToConditions(srcInfo, *ASSERT_NOTNULL(itr->AreaConditions)))
{
changed = phaseShift.AddPhase(itr->Id, itr->Flags, itr->AreaConditions, itr->References) || changed;
suppressedPhaseShift.ModifyPhasesReferences(itr, -itr->References);
@@ -642,6 +646,8 @@ void PhasingHandler::PrintToChat(ChatHandler* chat, WorldObject const* target)
phases << ' ' << '(' << cosmetic << ')';
if (phase.Flags.HasFlag(PhaseFlags::Personal))
phases << ' ' << '(' << personal << ')';
if (DisableMgr::IsDisabledFor(DISABLE_TYPE_PHASE_AREA, phase.Id, nullptr))
phases << " (Disabled)";
}
chat->PSendSysMessage(LANG_PHASESHIFT_PHASES, phases.str().c_str());