From a9778e6e687e0258857086823e6b2b3d83aad191 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 10 Feb 2019 10:20:26 -0500
Subject: [PATCH] Bugfixes / Map tweaks

---
 core/assets/maps/frozenForest.mmap            | Bin 203286 -> 203286 bytes
 .../io/anuke/mindustry/content/TechTree.java  |  16 +++++++---------
 .../world/blocks/production/Separator.java    |   9 ---------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap
index 590c82cccf6d3e0241679933da72a2bacefbc385..130da8e7a279fb9e1f68a6d9ab13c3244329b3d0 100644
GIT binary patch
delta 591
zcmbQXg=g9po(-DO(;enArc6#qP?~-~h>>gh1Sv+=$@i;SC-<iCPhK6*H9h_?qsrtD
zJPS52h{<7^ydXwma)ATu<oSPWCl@T$f$QO#K3|HFYx9P9d*;ak8-yos2xXlvXU^z8
z{eu&u&g6!4*2xciStom6=AXPjo^^753hVR$LneXA7a~_pUJxTZJ%NRhb#s172GjHn
zvP_)QeYF`yCQnEdo%GgW@`pg~$^RD#Pk!L5GFhQ`%hUu$+3Dwn7$qlfI4n7NfBbZ?
z{(g2wuF3!J%56@_jAw+KAvyWNOVP;-{>V+f&=xvbp?DuyX0t&~Il><0$p*JrCr?OZ
zoj#A9QF&8-Kgj)j)4>MDr^<mu*`_}bV^p6!;hy~D4}Buj1KOFcO`p)q$hxVd25gQF
z*ofA}-qQ~(XL=5@gKv6)785JXnJSYP{IQw*fv0%#g*N5M6Z#D&Cp^>KY|zNbI9Xr=
z+$zb*sp~_h=`!90c?c9zVC~Z{h%pL)^~ZlYJlWuZ$aH^sCeG>lQy4`yHx%+Cnb03A
zGP!l0-saVHlbI)Pcq0M!!t_*OMw7{}E-Fqhuw*ix{DEiZ<PC3R;jRP4G}q+!yWdRD
z*I<;JUT}s{62*K;#>p4jbf$ke%&4-tx@`^fWPy){lO6gTrw1HjGH<@n)qbIiar=cX
HCbxb7kCEu;

delta 465
zcmbQXg=g9po(-DO(-&-EYMXvQh>>gh1Sv+=$@i;SC-<iCPhK6*H9h_?qsrtDJPS52
zh{<6>Rme4cz7!+Z<_+=o%pi#glOOo9PWHacKY4#V>*V|t*69I;OahZHM6Q~=AVzq4
z0t+MS=KPclrpXF6#giQhWhX!IRhg_%yk%+vqwMtaLX47=HyoCnygz<ANcrUWI=RUP
zx4b6{w0BJY!1H?Yg|^Vi3dQ@TZ;)l;+-#6j&NN-1hADDWen0c%4?H%L1wI;1J}}FD
z@&}$RU?rPMYM3S`{I;HcK%3ERazo)GkSO2u0xc$1m|ZH97yPlA{DG%<@`X0#$rJhw
zCnr49+}>cv<iI$2!?~#G0qsl=U|s_2nSMcxQ2?wd{?p;f1`kB0`^z(NPS>BpD6)OS
z14c*2=>=yPl_p;(W81vCZZgPS8k09H)SawwSbh3|<xI~fZ+IgMcL6ArxhB8g{bqW;
z2BREErzEOzHjE(6o2%Q_Fi#U@)S3KX?)u3N+47SwM5cfoJn5~&<O^LE%?ds33O$V5
K6?&My^#TCS7{YJ>

diff --git a/core/src/io/anuke/mindustry/content/TechTree.java b/core/src/io/anuke/mindustry/content/TechTree.java
index 1af9e96450..a656674c91 100644
--- a/core/src/io/anuke/mindustry/content/TechTree.java
+++ b/core/src/io/anuke/mindustry/content/TechTree.java
@@ -245,15 +245,13 @@ public class TechTree implements ContentList{
 
                     node(spiritFactory, () -> {
                         node(daggerFactory, () -> {
-                            node(daggerFactory, () -> {
-                                node(titanFactory, () -> {
-                                    node(fortressFactory);
-                                });
-                                node(wraithFactory, () -> {
-                                    node(phantomFactory);
-                                    node(ghoulFactory, () -> {
-                                        node(revenantFactory);
-                                    });
+                            node(titanFactory, () -> {
+                                node(fortressFactory);
+                            });
+                            node(wraithFactory, () -> {
+                                node(phantomFactory);
+                                node(ghoulFactory, () -> {
+                                    node(revenantFactory);
                                 });
                             });
                         });
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
index 251429e2ea..160a5cb240 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
@@ -32,8 +32,6 @@ public class Separator extends Block{
     protected Color color = Color.valueOf("858585");
     protected TextureRegion liquidRegion;
 
-    protected boolean offloading = false;
-
     public Separator(String name){
         super(name);
         update = true;
@@ -113,9 +111,7 @@ public class Separator extends Block{
             }
 
             if(item != null && entity.items.get(item) < itemCapacity){
-                offloading = true;
                 offloadNear(tile, item);
-                offloading = false;
             }
         }
 
@@ -124,11 +120,6 @@ public class Separator extends Block{
         }
     }
 
-    @Override
-    public boolean canDump(Tile tile, Tile to, Item item){
-        return offloading || item != consumes.item();
-    }
-
     @Override
     public TileEntity newEntity(){
         return new GenericCrafterEntity();