Fix more unit vs targetUnit bugs

Author: Jasper Geurtz

src/main/java/bwapi/Unit.java

@@ -3911,7 +3911,7 @@ public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit,
             return false;
         }
 
-        if (isInvincible()) {
+        if (targetUnit.isInvincible()) {
             return false;
         }
 
@@ -4722,9 +4722,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() {