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

Core/Unit: Update collision height calculation

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f75f8d9bb8c0d764b8a7926476e7a16a3cfad713)
This commit is contained in:
hondacrx
2022-09-11 14:31:09 -04:00
parent 503bd57fe0
commit 7cef6fc018
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.cs
+1 -1
View File
@@ -6172,7 +6172,7 @@ namespace Game.Entities
SetBoundingRadius(scale * SharedConst.DefaultPlayerBoundingRadius); SetBoundingRadius(scale * SharedConst.DefaultPlayerBoundingRadius);
SetCombatReach(scale * SharedConst.DefaultPlayerCombatReach); SetCombatReach(scale * SharedConst.DefaultPlayerCombatReach);
if (IsInWorld) if (IsInWorld)
SendMovementSetCollisionHeight(scale * GetCollisionHeight(), UpdateCollisionHeightReason.Scale); SendMovementSetCollisionHeight(GetCollisionHeight(), UpdateCollisionHeightReason.Scale);
} }
public bool HasRaceChanged() { return m_ExtraFlags.HasFlag(PlayerExtraFlags.HasRaceChanged); } public bool HasRaceChanged() { return m_ExtraFlags.HasFlag(PlayerExtraFlags.HasRaceChanged); }
Source/Game/Entities/Unit/Unit.cs
+1 -1
View File
@@ -874,7 +874,7 @@ namespace Game.Entities
{ {
var displayInfo = CliDB.CreatureDisplayInfoStorage.LookupByKey(GetNativeDisplayId()); var displayInfo = CliDB.CreatureDisplayInfoStorage.LookupByKey(GetNativeDisplayId());
var modelData = CliDB.CreatureModelDataStorage.LookupByKey(displayInfo.ModelID); 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; return collisionHeight == 0.0f ? MapConst.DefaultCollesionHeight : collisionHeight;
} }
} }