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

Fixed unit drop crash

Browse Source
This commit is contained in:
Anuken
2018-09-20 11:18:57 -04:00
parent ebbf01c6e5
commit 33d65a8593
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/world/BaseBlock.java
View File

@@ -44,7 +44,7 @@ public abstract class BaseBlock extends MappableContent{
* Returns the amount of items this block can accept. * Returns the amount of items this block can accept.
*/ */
public int acceptStack(Item item, int amount, Tile tile, Unit source){ public int acceptStack(Item item, int amount, Tile tile, Unit source){
if(acceptItem(item, tile, tile) && hasItems && source.getTeam() == tile.getTeam()){ if(acceptItem(item, tile, tile) && hasItems && (source == null || source.getTeam() == tile.getTeam())){
return Math.min(getMaximumAccepted(tile, item), amount); return Math.min(getMaximumAccepted(tile, item), amount);
}else{ }else{
return 0; return 0;

2
core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -155,7 +155,7 @@ public class CoreBlock extends StorageBlock{
@Override @Override
public int acceptStack(Item item, int amount, Tile tile, Unit source){ public int acceptStack(Item item, int amount, Tile tile, Unit source){
if(acceptItem(item, tile, tile) && hasItems && source.getTeam() == tile.getTeam()){ if(acceptItem(item, tile, tile) && hasItems && (source == null || source.getTeam() == tile.getTeam())){
return Math.min(itemCapacity - tile.entity.items.get(item), amount); return Math.min(itemCapacity - tile.entity.items.get(item), amount);
}else{ }else{
return 0; return 0;