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

Fixed bridge infinite capacity / Fixed crash

Browse Source
This commit is contained in:
Anuken
2018-09-02 15:19:54 -04:00
parent a01f64080d
commit 0b4b30286d
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/maps/generation/Generation.java
View File

@@ -45,7 +45,7 @@ public class Generation{
return null; return null;
} }
if(!block.isValid(tiles[worldx][worldy])) continue; if(!block.isValid(tiles[worldx][worldy]) || tiles[worldx][worldy].floor().drops == null) continue;
Item drop = tiles[worldx][worldy].floor().drops.item; Item drop = tiles[worldx][worldy].floor().drops.item;

2
core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -253,7 +253,7 @@ public class ItemBridge extends Block{
if(rel == rel2) return false; if(rel == rel2) return false;
}else{ }else{
return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.packedPosition(); return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.packedPosition() && tile.entity.items.total() < itemCapacity;
} }
return tile.entity.items.total() < itemCapacity; return tile.entity.items.total() < itemCapacity;