mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-14 01:37:36 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-10-26 11:52:37 -04:00
parent db5298e40c 0b7c8bdcd8
commit a2181fec48
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,6 +156,7 @@ public class StackConveyor extends Block implements Autotiler{
if(bits[0] == 0 && blends(tile, rotation, 0) && !blends(tile, rotation, 2)) state = stateLoad; // a 0 that faces into a conveyor with none behind it if(bits[0] == 0 && blends(tile, rotation, 0) && !blends(tile, rotation, 2)) state = stateLoad; // a 0 that faces into a conveyor with none behind it
if(bits[0] == 0 && !blends(tile, rotation, 0) && blends(tile, rotation, 2)) state = stateUnload; // a 0 that faces into none with a conveyor behind it if(bits[0] == 0 && !blends(tile, rotation, 0) && blends(tile, rotation, 2)) state = stateUnload; // a 0 that faces into none with a conveyor behind it
if(!headless){
blendprox = 0; blendprox = 0;
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
@ -163,6 +164,7 @@ public class StackConveyor extends Block implements Autotiler{
blendprox |= (1 << i); blendprox |= (1 << i);
} }
} }
}
//update other conveyor state when this conveyor's state changes //update other conveyor state when this conveyor's state changes
if(state != lastState){ if(state != lastState){