Merge remote-tracking branch 'origin' into newlatcom

JasperGeurtz · JasperGeurtz · commit f7d9963a6ac4 · 2019-10-01T09:48:33.000+03:00
diff --git a/src/main/java/bwapi/Unit.java b/src/main/java/bwapi/Unit.java
@@ -5148,7 +5148,7 @@ public boolean canLoad(Unit targetUnit, boolean checkCanTargetUnit, boolean chec
         final UnitType unitThatLoadsType = unitThatLoads.getType();
 
         if (unitThatLoadsType == Terran_Bunker) {
-            if (!unitThatLoadsType.isOrganic() || unitThatLoadsType.getRace() != Terran) {
+            if (!unitToBeLoadedType.isOrganic() || unitToBeLoadedType.getRace() != Terran) {
                 return false;
             }
             if (!unitToBeLoaded.hasPath(unitThatLoads.getPosition())) {

Original file line number	Diff line number	Diff line change
`@@ -5148,7 +5148,7 @@ public boolean canLoad(Unit targetUnit, boolean checkCanTargetUnit, boolean chec`
`5148`	`5148`	`final UnitType unitThatLoadsType = unitThatLoads.getType();`
`5149`	`5149`
`5150`	`5150`	`if (unitThatLoadsType == Terran_Bunker) {`
`5151`		`- if (!unitThatLoadsType.isOrganic() \|\| unitThatLoadsType.getRace() != Terran) {`
	`5151`	`+ if (!unitToBeLoadedType.isOrganic() \|\| unitToBeLoadedType.getRace() != Terran) {`
`5152`	`5152`	`return false;`
`5153`	`5153`	`}`
`5154`	`5154`	`if (!unitToBeLoaded.hasPath(unitThatLoads.getPosition())) {`