From c73286358c181fb21cc319a013304397aa729f96 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 23 Mar 2018 23:00:08 -0400 Subject: [PATCH] Changed router passback function to take items into account --- core/assets/version.properties | 4 ++-- .../world/blocks/types/distribution/Router.java | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/assets/version.properties b/core/assets/version.properties index 081e2158aa..5b72d7882f 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Mar 23 22:35:52 EDT 2018 +#Fri Mar 23 22:59:10 EDT 2018 version=release -androidBuildCode=623 +androidBuildCode=625 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Router.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Router.java index c457650930..5039d0c6dd 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Router.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Router.java @@ -26,7 +26,17 @@ public class Router extends Block{ } } } - + + @Override + public boolean canDump(Tile tile, Tile to, Item item) { + if(to.block() instanceof Router){ + return ((float)to.target().entity.inventory.totalItems() / to.target().block().itemCapacity) < + ((float)tile.entity.inventory.totalItems() / to.target().block().itemCapacity); + }else{ + return true; + } + } + @Override public void handleItem(Item item, Tile tile, Tile source){ super.handleItem(item, tile, source);