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

Fixed dropping items into enemy blocks

Browse Source
This commit is contained in:
Anuken
2018-08-27 13:56:20 -04:00
parent d8f9059989
commit 28c13c8e52
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@@ -188,7 +188,7 @@ public class OverlayRenderer{
Tile tile = world.tileWorld(v.x, v.y); Tile tile = world.tileWorld(v.x, v.y);
if(tile != null) tile = tile.target(); if(tile != null) tile = tile.target();
if(tile != null && tile.block().acceptStack(player.inventory.getItem().item, player.inventory.getItem().amount, tile, player) > 0){ if(tile != null && tile.getTeam() == player.getTeam() && tile.block().acceptStack(player.inventory.getItem().item, player.inventory.getItem().amount, tile, player) > 0){
Draw.color(Palette.place); Draw.color(Palette.place);
Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1 + Mathf.absin(Timers.time(), 5f, 1f)); Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1 + Mathf.absin(Timers.time(), 5f, 1f));
Draw.color(); Draw.color();

2
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@@ -302,7 +302,7 @@ public abstract class InputHandler extends InputAdapter{
ItemStack stack = player.inventory.getItem(); ItemStack stack = player.inventory.getItem();
if(tile.block().acceptStack(stack.item, stack.amount, tile, player) > 0 && tile.block().hasItems){ if(tile.block().acceptStack(stack.item, stack.amount, tile, player) > 0 && tile.getTeam() == player.getTeam() && tile.block().hasItems){
Call.transferInventory(player, tile); Call.transferInventory(player, tile);
}else{ }else{
Call.dropItem(player.angleTo(x, y)); Call.dropItem(player.angleTo(x, y));