Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Condition: Implemented condition CONDITION_PRIVATE_OBJECT (#29136)

Browse Source
This commit is contained in:
ModoX
2023-07-21 17:54:27 +02:00
committed by GitHub
parent ac48da6275
commit f28b4eed3d
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -629,6 +629,11 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
condMeets = ConditionMgr::IsPlayerMeetingCondition(player, playerCondition);
break;
}
case CONDITION_PRIVATE_OBJECT:
{
condMeets = !object->GetPrivateObjectOwner().IsEmpty();
break;
}
default:
break;
}
@@ -841,6 +846,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const
case CONDITION_PLAYER_CONDITION:
mask |= GRID_MAP_TYPE_MASK_PLAYER;
break;
case CONDITION_PRIVATE_OBJECT:
mask |= GRID_MAP_TYPE_MASK_ALL & ~GRID_MAP_TYPE_MASK_PLAYER;
break;
default:
ABORT_MSG("Condition::GetSearcherTypeMaskForCondition - missing condition handling!");
break;
@@ -2697,6 +2705,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const
case CONDITION_CHARMED:
case CONDITION_TAXI:
case CONDITION_GAMEMASTER:
case CONDITION_PRIVATE_OBJECT:
break;
case CONDITION_DIFFICULTY_ID:
if (!sDifficultyStore.LookupEntry(cond->ConditionValue1))

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

@@ -114,6 +114,7 @@ enum ConditionTypes
CONDITION_SCENARIO_STEP = 54, // ScenarioStepId 0 0 true if player is at scenario with current step equal to ScenarioStepID
CONDITION_SCENE_IN_PROGRESS = 55, // SceneScriptPackageId 0 0 true if player is playing a scene with ScriptPackageId equal to given value
CONDITION_PLAYER_CONDITION = 56, // PlayerConditionId 0 0 true if player satisfies PlayerCondition
CONDITION_PRIVATE_OBJECT = 57, // 0 0 0 true if entity is private object
CONDITION_MAX
};