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

Core/GameObjects: Fixed crash with transport gameobjects that have only 1 entry in TransportAnimation/TransportRotation db2

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ea3f7f665b658744970a4cdc24b30e09342039cd)
This commit is contained in:
hondacrx
2023-02-12 01:26:34 -05:00
parent 1ed5fadf4d
commit 5f07fba067
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/GameObject/GameObject.cs
+14 -4
View File
@@ -4054,10 +4054,15 @@ namespace Game.Entities
Vector3 prev = new(oldAnimation.Pos.X, oldAnimation.Pos.Y, oldAnimation.Pos.Z); Vector3 prev = new(oldAnimation.Pos.X, oldAnimation.Pos.Y, oldAnimation.Pos.Z);
Vector3 next = new(newAnimation.Pos.X, newAnimation.Pos.Y, newAnimation.Pos.Z); Vector3 next = new(newAnimation.Pos.X, newAnimation.Pos.Y, newAnimation.Pos.Z);
float animProgress = (float)(newProgress - oldAnimation.TimeIndex) / (float)(newAnimation.TimeIndex - oldAnimation.TimeIndex); Vector3 dst = next;
if (prev != next)
{
float animProgress = (float)(newProgress - oldAnimation.TimeIndex) / (float)(newAnimation.TimeIndex - oldAnimation.TimeIndex);
Vector3 dst = pathRotation.Multiply(Vector3.Lerp(prev, next, animProgress)); dst = pathRotation.Multiply(Vector3.Lerp(prev, next, animProgress));
}
dst = pathRotation.Multiply(dst);
dst += _owner.GetStationaryPosition(); dst += _owner.GetStationaryPosition();
_owner.GetMap().GameObjectRelocation(_owner, dst.X, dst.Y, dst.Z, _owner.GetOrientation()); _owner.GetMap().GameObjectRelocation(_owner, dst.X, dst.Y, dst.Z, _owner.GetOrientation());
@@ -4070,9 +4075,14 @@ namespace Game.Entities
Quaternion prev = new(oldRotation.Rot[0], oldRotation.Rot[1], oldRotation.Rot[2], oldRotation.Rot[3]); Quaternion prev = new(oldRotation.Rot[0], oldRotation.Rot[1], oldRotation.Rot[2], oldRotation.Rot[3]);
Quaternion next = new(newRotation.Rot[0], newRotation.Rot[1], newRotation.Rot[2], newRotation.Rot[3]); Quaternion next = new(newRotation.Rot[0], newRotation.Rot[1], newRotation.Rot[2], newRotation.Rot[3]);
float animProgress = (float)(newProgress - oldRotation.TimeIndex) / (float)(newRotation.TimeIndex - oldRotation.TimeIndex); Quaternion rotation = next;
Quaternion rotation = Quaternion.Lerp(prev, next, animProgress); if (prev != next)
{
float animProgress = (float)(newProgress - oldRotation.TimeIndex) / (float)(newRotation.TimeIndex - oldRotation.TimeIndex);
rotation = Quaternion.Lerp(prev, next, animProgress);
}
_owner.SetLocalRotation(rotation.X, rotation.Y, rotation.Z, rotation.W); _owner.SetLocalRotation(rotation.X, rotation.Y, rotation.Z, rotation.W);
_owner.UpdateModelPosition(); _owner.UpdateModelPosition();