diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index c1b2fce6..61339cca 100644 --- 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 diff --git a/src/main/java/electrosphere/collision/CollisionEngine.java b/src/main/java/electrosphere/collision/CollisionEngine.java index 555ff12e..375e3b2c 100644 --- 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),