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-05-20 20:28:52 -04:00
parent 5b445c59c1
commit 42ba97f872
16 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/input/DesktopInput.java
View File

@@ -504,9 +504,7 @@ public class DesktopInput extends InputHandler{
removeSelection(selectX, selectY, cursorX, cursorY);
}
if(selected != null && selected.entity != null){
tryDropItems(selected.entity, Core.input.mouseWorld().x, Core.input.mouseWorld().y);
}
tryDropItems(selected == null ? null : selected.entity, Core.input.mouseWorld().x, Core.input.mouseWorld().y);
if(sreq != null){
if(getRequest(sreq.x, sreq.y, sreq.block.size, sreq) != null){

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

@@ -802,7 +802,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
return droppingItem;
}
public void tryDropItems(Tilec tile, float x, float y){
public void tryDropItems(@Nullable Tilec tile, float x, float y){
if(!droppingItem || player.unit().stack().amount <= 0 || canTapPlayer(x, y) || state.isPaused() ){
droppingItem = false;
return;
@@ -812,7 +812,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ItemStack stack = player.unit().stack();
if(tile.acceptStack(stack.item, stack.amount, player.unit()) > 0 && tile.interactable(player.team()) && tile.block().hasItems && player.unit().stack().amount > 0 && tile.interactable(player.team())){
if(tile != null && tile.acceptStack(stack.item, stack.amount, player.unit()) > 0 && tile.interactable(player.team()) && tile.block().hasItems && player.unit().stack().amount > 0 && tile.interactable(player.team())){
Call.transferInventory(player, tile);
}else{
Call.dropItem(player.angleTo(x, y));