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

Incorrect conveyor movement transitions

Browse Source
This commit is contained in:
Anuken
2018-09-20 17:14:03 -04:00
parent 33d65a8593
commit 893bfce767
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -231,6 +231,21 @@ public class Conveyor extends Block{
pos.y = Mathf.clamp(pos.y); pos.y = Mathf.clamp(pos.y);
if(pos.y >= 0.9999f && offloadDir(tile, pos.item)){ if(pos.y >= 0.9999f && offloadDir(tile, pos.item)){
Tile next = tile.getNearby(tile.getRotation());
if(next.block() instanceof Conveyor){
ConveyorEntity othere = next.entity();
ItemPos ni = pos2.set(othere.convey.first(), ItemPos.updateShorts);
if(Mathf.mod(next.getRotation() - tile.getRotation(), 2) == 0){
ni.x = pos.x;
}else if((tile.getRotation() + 1) % 4 == next.getRotation()){
ni.y = (pos.x + 1f)/2f;
}else{
ni.y = 1f-(pos.x + 1f)/2f;
}
othere.convey.set(0, ni.pack());
}
minremove = Math.min(i, minremove); minremove = Math.min(i, minremove);
tile.entity.items.remove(pos.item, 1); tile.entity.items.remove(pos.item, 1);
}else{ }else{