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

Bridge cleanup

Browse Source
This commit is contained in:
Anuken
2019-11-14 18:53:24 -05:00
parent 0cf9ef66fa
commit 016823d446
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,18 +45,7 @@ public class ItemBridge extends Block{
@Override @Override
public void configured(Tile tile, Player player, int value){ public void configured(Tile tile, Player player, int value){
ItemBridgeEntity entity = tile.entity(); tile.<ItemBridgeEntity>entity().link = value;
if(world.tile(entity.link) != null && world.tile(entity.link).entity instanceof ItemBridgeEntity){
ItemBridgeEntity oe = world.tile(entity.link).entity();
oe.incoming.remove(tile.pos());
}
entity.link = value;
if(world.tile(value) != null && world.tile(value).entity instanceof ItemBridgeEntity){
((ItemBridgeEntity)world.tile(value).entity).incoming.add(tile.pos());
}
} }
@Override @Override
@@ -195,6 +184,7 @@ public class ItemBridge extends Block{
tryDump(tile); tryDump(tile);
entity.uptime = 0f; entity.uptime = 0f;
}else{ }else{
((ItemBridgeEntity)world.tile(entity.link).entity).incoming.add(tile.pos());
if(entity.cons.valid() && Mathf.zero(1f - entity.efficiency())){ if(entity.cons.valid() && Mathf.zero(1f - entity.efficiency())){
entity.uptime = Mathf.lerpDelta(entity.uptime, 1f, 0.04f); entity.uptime = Mathf.lerpDelta(entity.uptime, 1f, 0.04f);

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=733de7c64e56ecaaec16275889c3f01399cfe38b archash=c01a92404885b43cb5d3252ae0298aee6c755164