Fixed bug where all contacts were deemed standard

mapierce · Mar 30, 2020 · 69e8143 · 69e8143
1 parent f34818b
commit 69e8143
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Ball.pde b/Ball.pde
@@ -133,7 +133,7 @@ class Ball {
             float dist = sqrt(dx*dx+dy*dy);
             boolean currentCanMove = velocity.x != 0.0 && velocity.y != 0.0; 
             boolean otherCanMove = other.velocity.x != 0.0 && other.velocity.y != 0.0;
-            if(dist < Constants.Simulator.RADIUS + Constants.Simulator.RADIUS) {
+            if(dist < Constants.Simulator.RADIUS + Constants.Simulator.RADIUS && currentCanMove && otherCanMove) {
                 updatePosition(other,dx,dy);
                 updateInfected(other);
             } else if (dist < Constants.Simulator.RADIUS + Constants.Simulator.RADIUS && currentCanMove && !otherCanMove) {