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/Conditions: Log errors at startup when using condition types reserved for master branch

Browse Source
This commit is contained in:
Shauren
2025-12-20 00:50:53 +01:00
parent a58afc7951
commit a26ace1cd5
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -743,6 +743,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const
case CONDITION_GAMEMASTER:
mask |= GRID_MAP_TYPE_MASK_PLAYER;
break;
case CONDITION_PRIVATE_OBJECT:
mask |= GRID_MAP_TYPE_MASK_ALL & ~GRID_MAP_TYPE_MASK_PLAYER;
break;
case CONDITION_STRING_ID:
mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_GAMEOBJECT;
break;
@@ -2401,8 +2404,17 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const
case CONDITION_CHARMED:
case CONDITION_TAXI:
case CONDITION_GAMEMASTER:
case CONDITION_STRING_ID:
default:
break;
case CONDITION_BATTLE_PET_COUNT:
case CONDITION_SCENARIO_STEP:
case CONDITION_SCENE_IN_PROGRESS:
case CONDITION_PLAYER_CONDITION:
case CONDITION_PRIVATE_OBJECT:
case CONDITION_LABEL:
TC_LOG_ERROR("sql.sql", "{} uses condition type not supported in this game version, skipped.", cond->ToString(true));
return false;
}
if (cond->ConditionValue1 && !StaticConditionTypeData[cond->ConditionType].HasConditionValue1)