From d51d6b0abeec25a7c7fd4903ddbca0124ee8c723 Mon Sep 17 00:00:00 2001 From: Meji Date: Sun, 23 Jun 2024 20:41:18 +0200 Subject: Core/AreaTriggers: Check actionset flags for client areatriggers to allow some areatriggers to trigger while dead (#30042) --- src/server/database/Database/Implementation/HotfixDatabase.cpp | 4 ++++ src/server/database/Database/Implementation/HotfixDatabase.h | 3 +++ 2 files changed, 7 insertions(+) (limited to 'src/server/database/Database') 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, -- cgit v1.2.3