From 39db04872c926b1f5f3883b135213cfb55a5b8bf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 18 Feb 2018 11:33:38 -0500
Subject: [PATCH] Minor cleanup

---
 core/assets/version.properties                             | 2 +-
 .../mindustry/world/blocks/types/distribution/Sorter.java  | 3 +--
 .../world/blocks/types/distribution/Splitter.java          | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index a09d924b2b..5492ad5da9 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,5 +1,5 @@
 #Autogenerated file. Do not modify.
-#Sun Feb 18 11:29:39 EST 2018
+#Sun Feb 18 11:33:00 EST 2018
 version=beta
 androidBuildCode=235
 name=Mindustry
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Sorter.java
index bf05956ed1..c30d6074d1 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Sorter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Sorter.java
@@ -46,7 +46,6 @@ public class Sorter extends Block{
 	
 	@Override
 	public boolean acceptItem(Item item, Tile tile, Tile source){
-		if(source.block() instanceof Sorter || source.block() instanceof Splitter) return false;
 		Tile to = getTileTarget(item, tile, source, false);
 		
 		return to != null && to.block().acceptItem(item, to, tile);
@@ -80,7 +79,7 @@ public class Sorter extends Block{
 				to = a;
 			}else if(bc && !ac){
 				to = b;
-			}else if(!bc && !ac){
+			}else if(!bc){
 				return null;
 			}else{
 				if(dest.getDump() == 0){
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java
index a08f11c0ec..31a0bd21b3 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java
@@ -15,7 +15,6 @@ public class Splitter extends Block{
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
-        if(source.block() instanceof Sorter || source.block() instanceof Splitter) return false;
         Tile to = getTileTarget(item, tile, source, false);
 
         return to != null && to.block().acceptItem(item, to, tile);
@@ -35,8 +34,10 @@ public class Splitter extends Block{
 
         Tile a = dest.getNearby(Mathf.mod(dir - 1, 4));
         Tile b = dest.getNearby(Mathf.mod(dir + 1, 4));
-        boolean ac = a.block().acceptItem(item, a, dest);
-        boolean bc = b.block().acceptItem(item, b, dest);
+        boolean ac = !(a.block().instantTransfer && source.block().instantTransfer) &&
+                a.block().acceptItem(item, a, dest);
+        boolean bc = !(b.block().instantTransfer && source.block().instantTransfer) &&
+                b.block().acceptItem(item, b, dest);
 
         if(ac && !bc){
             to = a;