Skip to content

fix: RemoveForces removing MoveRotation and MovePosition #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vyachkoslav wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: RemoveForces removing MoveRotation and MovePosition #1010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Assets/FishNet/Runtime/Object/Prediction/PredictionRigidbody.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,11 +484,12 @@ private void RemoveForces(bool nonAngular)
if (_pendingForces.Count > 0)
{
ForceApplicationType velocityApplicationTypes = ForceApplicationType.AddRelativeForce | ForceApplicationType.AddForce | ForceApplicationType.AddExplosiveForce;
ForceApplicationType nonVelocityTypes = ForceApplicationType.MovePosition | ForceApplicationType.MoveRotation;

List<EntryData> newDatas = CollectionCaches<EntryData>.RetrieveList();
foreach (EntryData item in _pendingForces)
{
if (VelocityApplicationTypesContains(item.Type) == !nonAngular)
if (TypesContain(velocityApplicationTypes, item.Type) == !nonAngular || TypesContain(nonVelocityTypes, item.Type))
newDatas.Add(item);
}
// Add back to _pendingForces if changed.
Expand All @@ -500,9 +501,9 @@ private void RemoveForces(bool nonAngular)
}
CollectionCaches<EntryData>.Store(newDatas);

bool VelocityApplicationTypesContains(ForceApplicationType apt)
static bool TypesContain(ForceApplicationType types, ForceApplicationType apt)
{
return (velocityApplicationTypes & apt) == apt;
return (types & apt) == apt;
}
}
}
Expand Down