From 016823d44652b70f278298b404eee92de6a18591 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 14 Nov 2019 18:53:24 -0500 Subject: [PATCH] Bridge cleanup --- .../world/blocks/distribution/ItemBridge.java | 14 ++------------ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java index a5ed073e6d..89c6d868d9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java @@ -45,18 +45,7 @@ public class ItemBridge extends Block{ @Override public void configured(Tile tile, Player player, int value){ - ItemBridgeEntity entity = tile.entity(); - - 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()); - } + tile.entity().link = value; } @Override @@ -195,6 +184,7 @@ public class ItemBridge extends Block{ tryDump(tile); entity.uptime = 0f; }else{ + ((ItemBridgeEntity)world.tile(entity.link).entity).incoming.add(tile.pos()); if(entity.cons.valid() && Mathf.zero(1f - entity.efficiency())){ entity.uptime = Mathf.lerpDelta(entity.uptime, 1f, 0.04f); diff --git a/gradle.properties b/gradle.properties index c5fbf4075c..1331da216c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=733de7c64e56ecaaec16275889c3f01399cfe38b +archash=c01a92404885b43cb5d3252ae0298aee6c755164