From 7cef6fc018505df883323e0d3609d9039abb9709 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 11 Sep 2022 14:31:09 -0400 Subject: [PATCH] Core/Unit: Update collision height calculation Port From (https://github.com/TrinityCore/TrinityCore/commit/f75f8d9bb8c0d764b8a7926476e7a16a3cfad713) --- Source/Game/Entities/Player/Player.cs | 2 +- Source/Game/Entities/Unit/Unit.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 87e93274c..0bdd4095f 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -6172,7 +6172,7 @@ namespace Game.Entities SetBoundingRadius(scale * SharedConst.DefaultPlayerBoundingRadius); SetCombatReach(scale * SharedConst.DefaultPlayerCombatReach); if (IsInWorld) - SendMovementSetCollisionHeight(scale * GetCollisionHeight(), UpdateCollisionHeightReason.Scale); + SendMovementSetCollisionHeight(GetCollisionHeight(), UpdateCollisionHeightReason.Scale); } public bool HasRaceChanged() { return m_ExtraFlags.HasFlag(PlayerExtraFlags.HasRaceChanged); } diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index 0f8199481..66382ea9c 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -874,7 +874,7 @@ namespace Game.Entities { var displayInfo = CliDB.CreatureDisplayInfoStorage.LookupByKey(GetNativeDisplayId()); var modelData = CliDB.CreatureModelDataStorage.LookupByKey(displayInfo.ModelID); - float collisionHeight = scaleMod * (mountModelData.MountHeight + modelData.CollisionHeight * modelData.ModelScale * displayInfo.CreatureModelScale * 0.5f); + float collisionHeight = scaleMod * ((mountModelData.MountHeight * mountDisplayInfo.CreatureModelScale) + (modelData.CollisionHeight * modelData.ModelScale * displayInfo.CreatureModelScale * 0.5f)); return collisionHeight == 0.0f ? MapConst.DefaultCollesionHeight : collisionHeight; } }