diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 86e6e44544..ca4b0e13ce 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1000,12 +1000,9 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, * @param todump Item to dump. Can be null to dump anything. */ public boolean dump(Item todump){ - if(!block.hasItems || items.total() == 0 || (todump != null && !items.has(todump))) return false; + if(!block.hasItems || items.total() == 0 || proximity.size == 0 || (todump != null && !items.has(todump))) return false; int dump = this.cdump; - - if(proximity.size == 0) return false; - var allItems = content.items(); int itemSize = allItems.size; Item[] itemArray = allItems.items; @@ -1714,8 +1711,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } } - //TODO probably should not have a shouldConsume() check? should you even *use* consValid? - public void consume(){ for(Consume cons : block.consumers){ cons.trigger(self()); diff --git a/gradle.properties b/gradle.properties index efd464dddc..663774945e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=9a41faa61b +archash=e20ff75344 diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java index f6a2834b9f..45b542134a 100644 --- a/ios/src/mindustry/ios/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -40,6 +40,8 @@ public class IOSLauncher extends IOSApplication.Delegate{ Scl.setAddition(-0.5f); } + Vars.loadFileLogger(); + return new IOSApplication(new ClientLauncher(){ @Override