mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-22 13:57:46 +03:00
Bugfixes
This commit is contained in:
parent
baaeb229cf
commit
2fcb3c4420
@ -29,10 +29,12 @@ public class DistributionBlocks extends BlockList implements ContentList{
|
|||||||
bridgeConveyor = new BufferedItemBridge("bridge-conveyor"){{
|
bridgeConveyor = new BufferedItemBridge("bridge-conveyor"){{
|
||||||
range = 3;
|
range = 3;
|
||||||
hasPower = false;
|
hasPower = false;
|
||||||
|
consumes.power(0.05f);
|
||||||
}};
|
}};
|
||||||
|
|
||||||
phaseConveyor = new ItemBridge("phase-conveyor"){{
|
phaseConveyor = new ItemBridge("phase-conveyor"){{
|
||||||
range = 7;
|
range = 7;
|
||||||
|
consumes.power(0.05f);
|
||||||
}};
|
}};
|
||||||
|
|
||||||
sorter = new Sorter("sorter");
|
sorter = new Sorter("sorter");
|
||||||
|
@ -24,7 +24,7 @@ public class LiquidBridge extends ItemBridge{
|
|||||||
entity.time2 += (entity.cycleSpeed - 1f) * Timers.delta();
|
entity.time2 += (entity.cycleSpeed - 1f) * Timers.delta();
|
||||||
|
|
||||||
Tile other = world.tile(entity.link);
|
Tile other = world.tile(entity.link);
|
||||||
if(!linkValid(tile, other)){
|
if(!linkValid(tile, other) ){
|
||||||
tryDumpLiquid(tile, entity.liquids.current());
|
tryDumpLiquid(tile, entity.liquids.current());
|
||||||
}else{
|
}else{
|
||||||
if(entity.cons.valid()){
|
if(entity.cons.valid()){
|
||||||
@ -33,7 +33,6 @@ public class LiquidBridge extends ItemBridge{
|
|||||||
entity.uptime = Mathf.lerpDelta(entity.uptime, 0f, 0.02f);
|
entity.uptime = Mathf.lerpDelta(entity.uptime, 0f, 0.02f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(entity.uptime >= 0.5f){
|
if(entity.uptime >= 0.5f){
|
||||||
|
|
||||||
if(tryMoveLiquid(tile, other, false, entity.liquids.current()) > 0.1f){
|
if(tryMoveLiquid(tile, other, false, entity.liquids.current()) > 0.1f){
|
||||||
|
@ -17,7 +17,7 @@ public class OverflowGate extends Splitter{
|
|||||||
if(dir == -1) return null;
|
if(dir == -1) return null;
|
||||||
Tile to = dest.getNearby(dir);
|
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))){
|
(to.block().instantTransfer && source.block().instantTransfer))){
|
||||||
Tile a = dest.getNearby(Mathf.mod(dir - 1, 4));
|
Tile a = dest.getNearby(Mathf.mod(dir - 1, 4));
|
||||||
Tile b = dest.getNearby(Mathf.mod(dir + 1, 4));
|
Tile b = dest.getNearby(Mathf.mod(dir + 1, 4));
|
||||||
|
@ -2,6 +2,7 @@ package io.anuke.mindustry.world.blocks.distribution;
|
|||||||
|
|
||||||
import com.badlogic.gdx.utils.Array;
|
import com.badlogic.gdx.utils.Array;
|
||||||
import io.anuke.mindustry.type.Item;
|
import io.anuke.mindustry.type.Item;
|
||||||
|
import io.anuke.mindustry.world.BarType;
|
||||||
import io.anuke.mindustry.world.Block;
|
import io.anuke.mindustry.world.Block;
|
||||||
import io.anuke.mindustry.world.Edges;
|
import io.anuke.mindustry.world.Edges;
|
||||||
import io.anuke.mindustry.world.Tile;
|
import io.anuke.mindustry.world.Tile;
|
||||||
@ -19,6 +20,13 @@ public class Splitter extends Block{
|
|||||||
group = BlockGroup.transportation;
|
group = BlockGroup.transportation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setBars(){
|
||||||
|
super.setBars();
|
||||||
|
|
||||||
|
bars.remove(BarType.inventory);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean acceptItem(Item item, Tile tile, Tile source){
|
public boolean acceptItem(Item item, Tile tile, Tile source){
|
||||||
Tile to = getTileTarget(item, tile, source, false);
|
Tile to = getTileTarget(item, tile, source, false);
|
||||||
|
Loading…
Reference in New Issue
Block a user