Preparing to swap for isBlocked checks

photonstorm · photonstorm · commit fcd7f25091d2 · 2019-03-19T23:21:59.000Z
diff --git a/src/physics/arcade/SeparateY.js b/src/physics/arcade/SeparateY.js
@@ -70,8 +70,8 @@ var SeparateY = function (body1, body2, overlapOnly, bias)
     //  At this point, the velocity from gravity, world rebounds, etc has been factored in.
     //  The body is moving the direction it wants to, but may be blocked and rebound.
 
-    var move1 = (!body1Immovable && (v1 >= 0 && !worldBlocked1.down) || (v1 < 0 && !worldBlocked1.up));
-    var move2 = (!body2Immovable && (v2 >= 0 && !worldBlocked2.down) || (v2 < 0 && !worldBlocked2.up));
+    var move1 = (!body1Immovable && (v1 >= 0 && !body1.isBlockedDown()) || (v1 < 0 && !body1.isBlockedUp()));
+    var move2 = (!body2Immovable && (v2 >= 0 && !body2.isBlockedDown()) || (v2 < 0 && !body2.isBlockedUp()));
 
     if (move1 && move2)
     {

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ var SeparateY = function (body1, body2, overlapOnly, bias)`
`70`	`70`	`// At this point, the velocity from gravity, world rebounds, etc has been factored in.`
`71`	`71`	`// The body is moving the direction it wants to, but may be blocked and rebound.`
`72`	`72`
`73`		`- var move1 = (!body1Immovable && (v1 >= 0 && !worldBlocked1.down) \|\| (v1 < 0 && !worldBlocked1.up));`
`74`		`- var move2 = (!body2Immovable && (v2 >= 0 && !worldBlocked2.down) \|\| (v2 < 0 && !worldBlocked2.up));`
	`73`	`+ var move1 = (!body1Immovable && (v1 >= 0 && !body1.isBlockedDown()) \|\| (v1 < 0 && !body1.isBlockedUp()));`
	`74`	`+ var move2 = (!body2Immovable && (v2 >= 0 && !body2.isBlockedDown()) \|\| (v2 < 0 && !body2.isBlockedUp()));`
`75`	`75`
`76`	`76`	`if (move1 && move2)`
`77`	`77`	`{`