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

Move payload blend check to BuildingComp (#6152)

Browse Source
This commit is contained in:
Matthew Peng
2021-10-16 06:49:52 -07:00
committed by GitHub
parent 91acda56c1
commit 7ff9ad7351
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -432,6 +432,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
return block.unloadable; return block.unloadable;
} }
public boolean payloadCheck(int conveyorRotation){
return block.rotate && (rotation + 2) % 4 == conveyorRotation;
}
/** Called when an unloader takes an item. */ /** Called when an unloader takes an item. */
public void itemTaken(Item item){ public void itemTaken(Item item){

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

@@ -114,7 +114,7 @@ public class PayloadConveyor extends Block{
int ntrns = 1 + size/2; int ntrns = 1 + size/2;
Tile next = tile.nearby(Geometry.d4(rotation).x * ntrns, Geometry.d4(rotation).y * ntrns); Tile next = tile.nearby(Geometry.d4(rotation).x * ntrns, Geometry.d4(rotation).y * ntrns);
blocked = (next != null && next.solid() && !(next.block().outputsPayload || next.block().acceptsPayload)) || (this.next != null && this.next.block.rotate && (this.next.rotation + 2) % 4 == rotation); blocked = (next != null && next.solid() && !(next.block().outputsPayload || next.block().acceptsPayload)) || (this.next != null && this.next.payloadCheck(rotation));
} }
@Override @Override