Fixed #69

2018-01-09 20:28:18 -05:00
parent 974f0c8689
commit d58aab499c
1 changed files with 9 additions and 3 deletions
--- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
@@ -26,10 +26,16 @@ public class TunnelConveyor extends Block{
 		Tile tunnel = getDestTunnel(tile, item);
 		if(tunnel == null) return;
 		Tile to = tunnel.getNearby()[tunnel.getRotation()];
+		if(to == null) return;
+		Block before = to.block();
 		
-		Timers.run(25, ()->{
-			if(to == null || to.entity == null) return;
-			to.block().handleItem(item, to, tunnel);
+		Timers.run(25, () -> {
+			if(to.block() != before) return;
+			try {
+				to.block().handleItem(item, to, tunnel);
+			}catch (NullPointerException e){
+				e.printStackTrace();
+			}
 		});
 	}