From 0c9f2b268775d643054c2cd458665f637ac53b11 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 7 Jan 2023 12:06:57 -0500 Subject: [PATCH] Fixed #8092 --- .../world/blocks/payloads/PayloadConveyor.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java index 13aa410e49..04f5d3ed30 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java @@ -154,12 +154,14 @@ public class PayloadConveyor extends Block{ //trigger update forward next.updateTile(); - //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(); + 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(); + } } }else if(!blocked){ //dump item forward