aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2021-10-06 11:12:52 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-06 11:12:52 +0200
commitec4a3cd9accbcc0f2bcab5cfdad8dea7cb2befad (patch)
treefe4d3966f5386c4d7062bd30fd21ea448a1d70ce
parente073e09b86d8be7c55a49aa030fa703104561668 (diff)
Core/Conditions: Reserve CONDITION_SOURCE_TYPE_AREATRIGGER for master branch
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp5
-rw-r--r--src/server/game/Conditions/ConditionMgr.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index eb81bcba8cb..408cd0092a4 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -1819,6 +1819,11 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) const
TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_GRAVEYARD: is only for master branch, skipped");
return false;
}
+ case CONDITION_SOURCE_TYPE_AREATRIGGER:
+ {
+ TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_AREATRIGGER: is only for master branch, skipped");
+ return false;
+ }
case CONDITION_SOURCE_TYPE_GOSSIP_MENU:
case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION:
case CONDITION_SOURCE_TYPE_SMART_EVENT:
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index a2e3922cfe2..d6db55235a5 100644
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -148,6 +148,7 @@ enum ConditionSourceType
CONDITION_SOURCE_TYPE_TERRAIN_SWAP = 25, // only master
CONDITION_SOURCE_TYPE_PHASE = 26, // only master
CONDITION_SOURCE_TYPE_GRAVEYARD = 27, // only master
+ CONDITION_SOURCE_TYPE_AREATRIGGER = 28, // only master
CONDITION_SOURCE_TYPE_MAX = 28 // MAX
};