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

Remove conveyor integration remnants

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-03-05 21:29:19 +01:00
parent e2b9977ebc
commit 44bff5b7cf
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -116,7 +116,7 @@ public class Conveyor extends Block implements Autotiler{
@Override @Override
public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){ public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
return otherblock.outputsItems() && (lookingAt(tile, rotation, otherx, othery, otherrot, otherblock)); return otherblock.outputsItems() && lookingAt(tile, rotation, otherx, othery, otherrot, otherblock);
} }
@Override @Override

2
core/src/mindustry/world/blocks/distribution/CraterConveyor.java
View File

@@ -138,8 +138,6 @@ public class CraterConveyor extends Block implements Autotiler{
entity.blendbit1 = bits[0]; entity.blendbit1 = bits[0];
entity.blendsclx = bits[1]; entity.blendsclx = bits[1];
entity.blendscly = bits[2]; entity.blendscly = bits[2];
entity.proximity().each(t -> t.block() instanceof Conveyor, t -> t.block().onProximityUpdate(t));
} }
@Override @Override