mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-07 05:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #6164

Browse Source
This commit is contained in:
Anuken 2021-10-15 18:48:59 -04:00
parent e9e5fea306
commit 956cbe792b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/mindustry/logic/LExecutor.java
View File

@ -431,17 +431,16 @@ public class LExecutor{
Call.pickedUnitPayload(unit, result); Call.pickedUnitPayload(unit, result);
} }
}else{ //buildings }else{ //buildings
Building tile = world.buildWorld(unit.x, unit.y); Building build = world.buildWorld(unit.x, unit.y);
//TODO copy pasted code //TODO copy pasted code
if(tile != null && tile.team == unit.team){ if(build != null && build.team == unit.team){
if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){ Payload current = build.getPayload();
Call.pickedBuildPayload(unit, tile, true); if(current != null && pay.canPickupPayload(current)){
}else{ //pick up block payload Call.pickedBuildPayload(unit, build, false);
Payload current = tile.getPayload(); //pick up whole building directly
if(current != null && pay.canPickupPayload(current)){ }else if(build.block.buildVisibility != BuildVisibility.hidden && build.canPickup() && pay.canPickup(build)){
Call.pickedBuildPayload(unit, tile, false); Call.pickedBuildPayload(unit, build, true);
}
} }
} }
} }