diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap index 590c82cccf..130da8e7a2 100644 Binary files a/core/assets/maps/frozenForest.mmap and b/core/assets/maps/frozenForest.mmap differ 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();