Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/AreaTriggers: Check actionset flags for client areatriggers to allow some areatriggers to trigger while dead

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d51d6b0abeec25a7c7fd4903ddbca0124ee8c723)
This commit is contained in:
Hondacrx
2024-08-26 17:49:33 -04:00
parent b7b166c0f0
commit 254d04d37e
7 changed files with 79 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/CliDB.cs
+2
View File
@@ -57,6 +57,7 @@ namespace Game.DataStorage
AreaGroupMemberStorage = ReadDB2<AreaGroupMemberRecord>("AreaGroupMember.db2", HotfixStatements.SEL_AREA_GROUP_MEMBER);
AreaTableStorage = ReadDB2<AreaTableRecord>("AreaTable.db2", HotfixStatements.SEL_AREA_TABLE, HotfixStatements.SEL_AREA_TABLE_LOCALE);
AreaTriggerStorage = ReadDB2<AreaTriggerRecord>("AreaTrigger.db2", HotfixStatements.SEL_AREA_TRIGGER);
AreaTriggerActionSetStorage = ReadDB2<AreaTriggerActionSetRecord>("AreaTriggerActionSet.db2", HotfixStatements.SEL_AREA_TRIGGER_ACTION_SET);
ArmorLocationStorage = ReadDB2<ArmorLocationRecord>("ArmorLocation.db2", HotfixStatements.SEL_ARMOR_LOCATION);
ArtifactStorage = ReadDB2<ArtifactRecord>("Artifact.db2", HotfixStatements.SEL_ARTIFACT, HotfixStatements.SEL_ARTIFACT_APPEARANCE_LOCALE);
ArtifactAppearanceStorage = ReadDB2<ArtifactAppearanceRecord>("ArtifactAppearance.db2", HotfixStatements.SEL_ARTIFACT_APPEARANCE, HotfixStatements.SEL_ARTIFACT_APPEARANCE_LOCALE);
@@ -501,6 +502,7 @@ namespace Game.DataStorage
public static DB6Storage<AreaGroupMemberRecord> AreaGroupMemberStorage;
public static DB6Storage<AreaTableRecord> AreaTableStorage;
public static DB6Storage<AreaTriggerRecord> AreaTriggerStorage;
public static DB6Storage<AreaTriggerActionSetRecord> AreaTriggerActionSetStorage;
public static DB6Storage<ArmorLocationRecord> ArmorLocationStorage;
public static DB6Storage<ArtifactRecord> ArtifactStorage;
public static DB6Storage<ArtifactAppearanceRecord> ArtifactAppearanceStorage;
Source/Game/DataStorage/Structs/A_Records.cs
+10
View File
@@ -158,6 +158,16 @@ namespace Game.DataStorage
public short ShapeID;
public int AreaTriggerActionSetID;
public sbyte Flags;
public AreaTriggerShapeType GetShapeType() { return (AreaTriggerShapeType)ShapeType; }
}
public sealed class AreaTriggerActionSetRecord
{
public uint Id;
public int Flags;
public AreaTriggerActionSetFlag GetFlags() { return (AreaTriggerActionSetFlag)Flags; }
}
public sealed class ArmorLocationRecord