Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-09-09 23:39:00 -04:00
parent 2260e6824c
commit 3b5d6860d6
56 changed files with 554 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/input/InputHandler.java
View File

@@ -125,10 +125,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Unit unit = player.unit();
Payloadc pay = (Payloadc)unit;
if(tile != null && tile.team == unit.team && pay.canPickup(tile)
if(tile != null && tile.team == unit.team
&& unit.within(tile, tilesize * tile.block.size * 1.2f)){
//pick up block directly
if(tile.block().buildVisibility != BuildVisibility.hidden && tile.canPickup()){
if(tile.block().buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
pay.pickup(tile);
}else{ //pick up block payload
Payload current = tile.getPayload();
@@ -344,7 +344,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}else{
Building tile = world.buildWorld(pay.x(), pay.y());
if(tile != null && tile.team == unit.team && pay.canPickup(tile)){
if(tile != null && tile.team == unit.team){
Call.pickupBlockPayload(player, tile);
}
}