Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2020-10-26 11:52:37 -04:00
commit a2181fec48

View File

@ -156,11 +156,13 @@ 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 = stateUnload; // a 0 that faces into none with a conveyor behind it
blendprox = 0;
if(!headless){
blendprox = 0;
for(int i = 0; i < 4; i++){
if(blends(tile, rotation, i)){
blendprox |= (1 << i);
for(int i = 0; i < 4; i++){
if(blends(tile, rotation, i)){
blendprox |= (1 << i);
}
}
}