Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes / Map tweaks

Browse Source
This commit is contained in:
Anuken
2019-02-10 10:20:26 -05:00
parent ccaf888e8b
commit a9778e6e68
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/io/anuke/mindustry/content/TechTree.java
View File

@@ -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);
});
});
});

9
core/src/io/anuke/mindustry/world/blocks/production/Separator.java
View File

@@ -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();