fix server collision resolution on second body

2025-05-28 14:00:02 -04:00 · 2025-05-28 14:00:02 -04:00 · d3769a43d4
commit d3769a43d4
parent c32263675a
2 changed files with 2 additions and 1 deletions
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@ -2021,6 +2021,7 @@ Fix standard uniform buffer interaction with actor panel
 Fix foundation generation for structures in chunkgen
 Body synchronization includes enabled state
 Fix upright tree continuously re-enabling bodies
+Fix server collision resolution never triggering for second body



--- a/src/main/java/electrosphere/collision/CollisionEngine.java
+++ b/src/main/java/electrosphere/collision/CollisionEngine.java
@ -540,8 +540,8 @@ public class CollisionEngine {
                            );
                        CollisionEngine.resolveCollision(
                            contact.geom,
-                            c1,
                            c2,
+                            c1,
                            PhysicsUtils.odeVecToJomlVec(contact.geom.normal),
                            PhysicsUtils.odeVecToJomlVec(contact.fdir1),
                            PhysicsUtils.odeVecToJomlVec(contact.geom.pos),