From 76430c1e682d6d45a4abd0bc6e5c225d758af924 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 7 Jan 2023 16:21:03 -0500 Subject: [PATCH] a --- .../world/blocks/payloads/PayloadConveyor.java | 14 ++++++-------- gradle.properties | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java index 04f5d3ed30..49966047bb 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java @@ -154,14 +154,12 @@ public class PayloadConveyor extends Block{ //trigger update forward next.updateTile(); - if(next != null){ - //TODO add self to queue of next conveyor, then check if this conveyor was selected next frame - selection happens deterministically - if(next.acceptPayload(this, item)){ - //move forward. - next.handlePayload(this, item); - item = null; - moved(); - } + //TODO add self to queue of next conveyor, then check if this conveyor was selected next frame - selection happens deterministically + if(next != null && next.acceptPayload(this, item)){ + //move forward. + next.handlePayload(this, item); + item = null; + moved(); } }else if(!blocked){ //dump item forward diff --git a/gradle.properties b/gradle.properties index 33345ea5db..609d5d2907 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=1d7a035858 +archash=7230b65064