aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorModoX <moardox@gmail.com>2024-05-22 19:33:46 +0200
committerOvahlord <dreadkiller@gmx.de>2024-05-28 17:12:23 +0200
commitc99fb5df4d87c5285108ebbcdfd77bf6cbcaa1a3 (patch)
tree43ef5abe575fc3876b9b73884bc17fd28b3524ef /src
parent27d1749e2fa9a0e862c8a1be135139cd9f2d2ecb (diff)
Core/Conditions: Added private object to StaticConditionTypeData and defined CONDITION_STRING_ID as valid ConditionType
(cherry picked from commit cbef6f7860c3753d5182cd0532a3ea7a24e0f58a)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 69e0753b7ab..710bfec570c 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -155,6 +155,7 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND
{ "On Scenario Step", true, false, false, false },
{ "Scene In Progress", true, false, false, false },
{ "Player Condition", true, false, false, false },
+ { "Private Object", false, false, false, false },
{ "String ID", false, false, false, true }
};
@@ -2681,6 +2682,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const
case CONDITION_TAXI:
case CONDITION_GAMEMASTER:
case CONDITION_PRIVATE_OBJECT:
+ case CONDITION_STRING_ID:
break;
case CONDITION_DIFFICULTY_ID:
if (!sDifficultyStore.LookupEntry(cond->ConditionValue1))