mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix plastanium conveyor linking (#5185)

Browse Source
This commit is contained in:
Skat 2021-05-03 04:18:22 +04:00 committed by GitHub
parent 9e519ab801
commit 7853767ee5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/contributors
View File

@ -120,3 +120,4 @@ nilq
AsgerHB AsgerHB
AzCraft AzCraft
foo foo
Skat

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

@ -63,6 +63,7 @@ public class StackConveyor extends Block implements Autotiler{
return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock); return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
}else if(state == stateUnload){ //router mode }else if(state == stateUnload){ //router mode
return otherblock.acceptsItems && return otherblock.acceptsItems &&
(!(otherblock instanceof ArmoredConveyor) || lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock)) &&
(notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) || (notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) ||
(otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) && (otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) &&
!(world.build(otherx, othery) instanceof StackConveyorBuild s && s.state == stateUnload) && !(world.build(otherx, othery) instanceof StackConveyorBuild s && s.state == stateUnload) &&