mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-28 00:19:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2018-07-12 21:13:08 -04:00
parent baaeb229cf
commit 2fcb3c4420
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java
View File

@ -29,10 +29,12 @@ public class DistributionBlocks extends BlockList implements ContentList{
bridgeConveyor = new BufferedItemBridge("bridge-conveyor"){{
range = 3;
hasPower = false;
consumes.power(0.05f);
}};
phaseConveyor = new ItemBridge("phase-conveyor"){{
range = 7;
consumes.power(0.05f);
}};
sorter = new Sorter("sorter");

3
core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java
View File

@ -24,7 +24,7 @@ public class LiquidBridge extends ItemBridge{
entity.time2 += (entity.cycleSpeed - 1f) * Timers.delta();
Tile other = world.tile(entity.link);
if(!linkValid(tile, other)){
if(!linkValid(tile, other) ){
tryDumpLiquid(tile, entity.liquids.current());
}else{
if(entity.cons.valid()){
@ -33,7 +33,6 @@ public class LiquidBridge extends ItemBridge{
entity.uptime = Mathf.lerpDelta(entity.uptime, 0f, 0.02f);
}
if(entity.uptime >= 0.5f){
if(tryMoveLiquid(tile, other, false, entity.liquids.current()) > 0.1f){

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

@ -17,7 +17,7 @@ public class OverflowGate extends Splitter{
if(dir == -1) return null;
Tile to = dest.getNearby(dir);
if(!(to.block().acceptItem(item, to, dest) ||
if((!to.block().acceptItem(item, to, dest) ||
(to.block().instantTransfer && source.block().instantTransfer))){
Tile a = dest.getNearby(Mathf.mod(dir - 1, 4));
Tile b = dest.getNearby(Mathf.mod(dir + 1, 4));

8
core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java
View File

@ -2,6 +2,7 @@ package io.anuke.mindustry.world.blocks.distribution;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.BarType;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Edges;
import io.anuke.mindustry.world.Tile;
@ -19,6 +20,13 @@ public class Splitter extends Block{
group = BlockGroup.transportation;
}
@Override
public void setBars(){
super.setBars();
bars.remove(BarType.inventory);
}
@Override
public boolean acceptItem(Item item, Tile tile, Tile source){
Tile to = getTileTarget(item, tile, source, false);