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

Merge branch 'master' into crater

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-01-27 19:17:22 +01:00
parent 2e3f7d8db2 d21c47a582
commit 038fc72d7b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,7 +222,7 @@ public class ItemConveyor extends BaseConveyor implements Autotiler{
ItemConveyorEntity e = tile.ent(); ItemConveyorEntity e = tile.ent();
if(e.len >= capacity) return false; if(e.len >= capacity) return false;
int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.rotation()); int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.rotation());
return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.5f + itemSpace)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation())); return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.5f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation()));
} }
@Override @Override

6
servers.json
View File

@@ -1,5 +1,11 @@
[ [
{ {
"address": "mindustry.us.to" "address": "mindustry.us.to"
},
{
"address": "mindustry.ecansol.com:6597"
},
{
"address": "mindustry.ecansol.com:6499"
} }
] ]