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

Revert "Blend prototype"

Browse Source 
This reverts commit 35afc94d34.

# Conflicts:
#	core/assets/sprites/sprites.png
This commit is contained in:
Patrick 'Quezler' Mounier 2020-01-08 12:17:28 +01:00
parent 5c485eff04
commit 5f047603bf
No known key found for this signature in database
GPG Key ID: 0D6CA7326C76D8EA
4 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-5-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-6-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 743 KiB

After

Width:  |  Height:  |  Size: 744 KiB

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

@ -224,7 +224,7 @@ public class CraterConveyor extends BaseConveyor{
@Override
public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock) {
return super.blends(tile, rotation, otherx, othery, otherrot, otherblock) && (otherblock instanceof CraterConveyor || isStart(tile));
return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock) && otherblock instanceof CraterConveyor;
}
// has no crater conveyors facing into it