Merge remote-tracking branch 'origin/develop' into develop

bytekeeper · bytekeeper · commit f046df547d69 · 2019-03-06T19:38:29.000+01:00
diff --git a/src/main/java/bwem/ChokePointImpl.java b/src/main/java/bwem/ChokePointImpl.java
@@ -243,7 +243,7 @@ public void onBlockingNeutralDestroyed(final Neutral pBlocking) {
             throw new IllegalStateException();
         }
 
-        if (this.blockingNeutral.equals(pBlocking)) {
+        if (pBlocking.equals(this.blockingNeutral)) {
             // Ensures that in the case where several neutrals are stacked, blockingNeutral points to the
             // bottom one:
             this.blockingNeutral =

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public void onBlockingNeutralDestroyed(final Neutral pBlocking) {`
`243`	`243`	`throw new IllegalStateException();`
`244`	`244`	`}`
`245`	`245`
`246`		`- if (this.blockingNeutral.equals(pBlocking)) {`
	`246`	`+ if (pBlocking.equals(this.blockingNeutral)) {`
`247`	`247`	`// Ensures that in the case where several neutrals are stacked, blockingNeutral points to the`
`248`	`248`	`// bottom one:`
`249`	`249`	`this.blockingNeutral =`