Core/Conditions: Added private object to StaticConditionTypeData and defined CONDITION_STRING_ID as valid ConditionType
Port From (https://github.com/TrinityCore/TrinityCore/commit/cbef6f7860c3753d5182cd0532a3ea7a24e0f58a)
This commit is contained in:
@@ -1743,6 +1743,7 @@ namespace Game
|
|||||||
case ConditionTypes.Taxi:
|
case ConditionTypes.Taxi:
|
||||||
case ConditionTypes.Gamemaster:
|
case ConditionTypes.Gamemaster:
|
||||||
case ConditionTypes.PrivateObject:
|
case ConditionTypes.PrivateObject:
|
||||||
|
case ConditionTypes.StringId:
|
||||||
break;
|
break;
|
||||||
case ConditionTypes.DifficultyId:
|
case ConditionTypes.DifficultyId:
|
||||||
if (!CliDB.DifficultyStorage.ContainsKey(cond.ConditionValue1))
|
if (!CliDB.DifficultyStorage.ContainsKey(cond.ConditionValue1))
|
||||||
@@ -3078,6 +3079,7 @@ namespace Game
|
|||||||
new ConditionTypeInfo("On Scenario Step", true, false, false, false),
|
new ConditionTypeInfo("On Scenario Step", true, false, false, false),
|
||||||
new ConditionTypeInfo("Scene In Progress", true, false, false, false),
|
new ConditionTypeInfo("Scene In Progress", true, false, false, false),
|
||||||
new ConditionTypeInfo("Player Condition", true, false, false, false),
|
new ConditionTypeInfo("Player Condition", true, false, false, false),
|
||||||
|
new ConditionTypeInfo("Private Object", false,false, false, false),
|
||||||
new ConditionTypeInfo("String ID", true, false, false, true)
|
new ConditionTypeInfo("String ID", true, false, false, true)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user