@@ -3877,7 +3877,7 @@ public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit,
             return false;
         }
 
-        if (isInvincible()) {
+        if (targetUnit.isInvincible()) {
             return false;
         }
 
@@ -4688,9 +4688,7 @@ public boolean canGather(Unit targetUnit, boolean checkCanTargetUnit, boolean ch
         if (!hasPath(targetUnit.getPosition())) {
             return false;
         }
-
-        return !uType.isRefinery() || getPlayer().equals(game.self());
-
+        return !targetUnit.getType().isRefinery() || targetUnit.getPlayer().equals(game.self());
     }
 
     public boolean canReturnCargo() {
Original file line number	Diff line number	Diff line change
`@@ -3877,7 +3877,7 @@ public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit,`
`3877`	`3877`	`return false;`
`3878`	`3878`	`}`
`3879`	`3879`
`3880`		`- if (isInvincible()) {`
	`3880`	`+ if (targetUnit.isInvincible()) {`
`3881`	`3881`	`return false;`
`3882`	`3882`	`}`
`3883`	`3883`
`@@ -4688,9 +4688,7 @@ public boolean canGather(Unit targetUnit, boolean checkCanTargetUnit, boolean ch`
`4688`	`4688`	`if (!hasPath(targetUnit.getPosition())) {`
`4689`	`4689`	`return false;`
`4690`	`4690`	`}`
`4691`		`-`
`4692`		`- return !uType.isRefinery() \|\| getPlayer().equals(game.self());`
`4693`		`-`
	`4691`	`+ return !targetUnit.getType().isRefinery() \|\| targetUnit.getPlayer().equals(game.self());`
`4694`	`4692`	`}`
`4695`	`4693`
`4696`	`4694`	`public boolean canReturnCargo() {`