From 20a4e3116793a05036ff2eeb57b820ab521c68ee Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 26 May 2022 17:34:04 -0400 Subject: [PATCH] Core/AreaTriggers: Add missing 9.2 changes Port From (https://github.com/TrinityCore/TrinityCore/commit/1f6497f04ed383f10b9dabf7a817428fbe004d7e) --- Source/Game/DataStorage/AreaTriggerDataStorage.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Game/DataStorage/AreaTriggerDataStorage.cs b/Source/Game/DataStorage/AreaTriggerDataStorage.cs index c78b76430..948ca9d30 100644 --- a/Source/Game/DataStorage/AreaTriggerDataStorage.cs +++ b/Source/Game/DataStorage/AreaTriggerDataStorage.cs @@ -146,8 +146,8 @@ namespace Game.DataStorage // 0 1 2 3 4 5 6 7 8 9 10 SQLResult areatriggerCreateProperties = DB.World.Query("SELECT Id, AreaTriggerId, MoveCurveId, ScaleCurveId, MorphCurveId, FacingCurveId, AnimId, AnimKitId, DecalPropertiesId, TimeToTarget, TimeToTargetScale, " + - //11 12 13 14 15 16 17 18 - "Shape, ShapeData0, ShapeData1, ShapeData2, ShapeData3, ShapeData4, ShapeData5, ScriptName FROM `areatrigger_create_properties`"); + //11 12 13 14 15 16 17 18 19 20 + "Shape, ShapeData0, ShapeData1, ShapeData2, ShapeData3, ShapeData4, ShapeData5, ShapeData6, ShapeData7, ScriptName FROM `areatrigger_create_properties`"); if (!areatriggerCreateProperties.IsEmpty()) { do @@ -202,7 +202,7 @@ namespace Game.DataStorage createProperties.Shape.DefaultDatas.Data[i] = areatriggerCreateProperties.Read(12 + i); } - createProperties.ScriptId = Global.ObjectMgr.GetScriptId(areatriggerCreateProperties.Read(18)); + createProperties.ScriptId = Global.ObjectMgr.GetScriptId(areatriggerCreateProperties.Read(20)); if (shape == AreaTriggerTypes.Polygon) if (createProperties.Shape.PolygonDatas.Height <= 0.0f) @@ -288,8 +288,8 @@ namespace Game.DataStorage // Load area trigger positions (to put them on the server) // 0 1 2 3 4 5 6 7 8 9 10 SQLResult templates = DB.World.Query("SELECT SpawnId, AreaTriggerId, IsServerSide, MapId, PosX, PosY, PosZ, Orientation, PhaseUseFlags, PhaseId, PhaseGroup, " + - //11 12 13 14 15 16 17 18 - "Shape, ShapeData0, ShapeData1, ShapeData2, ShapeData3, ShapeData4, ShapeData5, ScriptName FROM `areatrigger`"); + //11 12 13 14 15 16 17 18 19 20 + "Shape, ShapeData0, ShapeData1, ShapeData2, ShapeData3, ShapeData4, ShapeData5, ShapeData6, ShapeData7, ScriptName FROM `areatrigger`"); if (!templates.IsEmpty()) { do @@ -334,7 +334,7 @@ namespace Game.DataStorage spawn.Shape.DefaultDatas.Data[i] = templates.Read(12 + i); } - spawn.ScriptId = Global.ObjectMgr.GetScriptId(templates.Read(18)); + spawn.ScriptId = Global.ObjectMgr.GetScriptId(templates.Read(20)); spawn.spawnGroupData = Global.ObjectMgr.GetLegacySpawnGroup(); // Add the trigger to a map::cell map, which is later used by GridLoader to query