From 0a997ceb69f2e344eac088ccc7363857d8766be4 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 1 Jul 2023 09:28:29 -0400 Subject: [PATCH] Core/AreaTriggers: Fixed selection range of units for box shape Port From (https://github.com/TrinityCore/TrinityCore/commit/39c137d7c0ac1b86a3a4647113e8e3a29a32b089) --- Source/Game/Entities/AreaTrigger/AreaTrigger.cs | 2 +- Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs index 12d8d2f32..5f0a5ba6c 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs @@ -430,7 +430,7 @@ namespace Game.Entities extentsZ = _shape.BoxDatas.Extents[2]; } - targetList.RemoveAll(unit => !unit.IsWithinBox(boxCenter, extentsX, extentsY, extentsZ)); + targetList.RemoveAll(unit => !unit.IsWithinBox(boxCenter, extentsX, extentsY, extentsZ / 2)); } void SearchUnitInPolygon(List targetList) diff --git a/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs b/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs index 10ce73960..a81de5306 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs @@ -208,7 +208,7 @@ namespace Game.Entities case AreaTriggerTypes.Sphere: return Math.Max(SphereDatas.Radius, SphereDatas.RadiusTarget); case AreaTriggerTypes.Box: - return MathF.Sqrt(BoxDatas.Extents[0] * BoxDatas.Extents[0] / 4 + BoxDatas.Extents[1] * BoxDatas.Extents[1] / 4); + return MathF.Sqrt(BoxDatas.Extents[0] * BoxDatas.Extents[0] + BoxDatas.Extents[1] * BoxDatas.Extents[1]); case AreaTriggerTypes.Cylinder: return Math.Max(CylinderDatas.Radius, CylinderDatas.RadiusTarget); case AreaTriggerTypes.Disk: