From af29eb8c96c1895c0349c9eea0052455b8d24aff Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 4 Oct 2017 21:58:12 -0400
Subject: [PATCH] Re-enabled junction chaining

---
 .../io/anuke/mindustry/world/blocks/ProductionBlocks.java   | 6 ++++--
 core/src/io/anuke/mindustry/world/blocks/types/Turret.java  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
index 36d2247cab..17a18b6dec 100644
--- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
@@ -67,7 +67,8 @@ public class ProductionBlocks{
 			int dir = source.relativeTo(tile.x, tile.y);
 			dir = (dir+4)%4;
 			Tile to = tile.getNearby()[dir];
-			Timers.run(10, ()->{
+			
+			Timers.run(15, ()->{
 				if(to == null || to.entity == null) return;
 				to.block().handleItem(to, item, tile);
 			});
@@ -79,7 +80,8 @@ public class ProductionBlocks{
 			int dir = source.relativeTo(dest.x, dest.y);
 			dir = (dir+4)%4;
 			Tile to = dest.getNearby()[dir];
-			return to != null && to.block() != junction && to.block().accept(item, to, dest);
+			//uncomment the junction bit to disable giving items to other junctions
+			return to != null /*&& to.block() != junction*/ && to.block().accept(item, to, dest);
 		}
 		
 		@Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/Turret.java b/core/src/io/anuke/mindustry/world/blocks/types/Turret.java
index 48cbea34d1..2e3047598a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/Turret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/Turret.java
@@ -33,7 +33,7 @@ public class Turret extends Block{
 	protected int ammoMultiplier = 20;
 	protected int maxammo = 400;
 	protected float rotatespeed = 0.2f;
-	protected float shootCone = 8f;
+	protected float shootCone = 2f;
 
 	public Turret(String name) {
 		super(name);