aboutsummaryrefslogtreecommitdiff
path: root/src/server/database/Database
diff options
context:
space:
mode:
authorMeji <alvaro.megias@outlook.com>2024-06-23 20:41:18 +0200
committerGitHub <noreply@github.com>2024-06-23 20:41:18 +0200
commitd51d6b0abeec25a7c7fd4903ddbca0124ee8c723 (patch)
tree9e291076766912259cc9d177176eee3beda0b6d3 /src/server/database/Database
parent31bd3804e35f63915a5d6d669b31add6c82d7010 (diff)
Core/AreaTriggers: Check actionset flags for client areatriggers to allow some areatriggers to trigger while dead (#30042)
Diffstat (limited to 'src/server/database/Database')
-rw-r--r--src/server/database/Database/Implementation/HotfixDatabase.cpp4
-rw-r--r--src/server/database/Database/Implementation/HotfixDatabase.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
index 73ac2c07afd..3bc8463be31 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.cpp
+++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -93,6 +93,10 @@ void HotfixDatabaseConnection::DoPrepareStatements()
"BoxWidth, BoxHeight, BoxYaw, ShapeType, ShapeID, AreaTriggerActionSetID, Flags FROM area_trigger WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
PREPARE_MAX_ID_STMT(HOTFIX_SEL_AREA_TRIGGER, "SELECT MAX(ID) + 1 FROM area_trigger", CONNECTION_SYNCH);
+ // AreaTriggerActionSet.db2
+ PrepareStatement(HOTFIX_SEL_AREA_TRIGGER_ACTION_SET, "SELECT ID, Flags FROM area_trigger_action_set WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+ PREPARE_MAX_ID_STMT(HOTFIX_SEL_AREA_TRIGGER_ACTION_SET, "SELECT MAX(ID) + 1 FROM area_trigger_action_set", CONNECTION_SYNCH);
+
// ArmorLocation.db2
PrepareStatement(HOTFIX_SEL_ARMOR_LOCATION, "SELECT ID, Clothmodifier, Leathermodifier, Chainmodifier, Platemodifier, Modifier FROM armor_location"
" WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.h b/src/server/database/Database/Implementation/HotfixDatabase.h
index 03b0631c45c..9120b72da52 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.h
+++ b/src/server/database/Database/Implementation/HotfixDatabase.h
@@ -63,6 +63,9 @@ enum HotfixDatabaseStatements : uint32
HOTFIX_SEL_AREA_TRIGGER,
HOTFIX_SEL_AREA_TRIGGER_MAX_ID,
+ HOTFIX_SEL_AREA_TRIGGER_ACTION_SET,
+ HOTFIX_SEL_AREA_TRIGGER_ACTION_SET_MAX_ID,
+
HOTFIX_SEL_ARMOR_LOCATION,
HOTFIX_SEL_ARMOR_LOCATION_MAX_ID,