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

Fixed #1447

Browse Source
This commit is contained in:
Anuken 2020-01-27 11:01:48 -05:00
parent b7e1adb8b1
commit 65211a6021
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/type/TileEntity.java
View File

@ -24,7 +24,7 @@ import java.io.*;
import static mindustry.Vars.*;
public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
public static final float timeToSleep = 60f * 4; //4 seconds to fall asleep
public static final float timeToSleep = 60f * 1; //1 second to fall asleep
private static final ObjectSet<Tile> tmpTiles = new ObjectSet<>();
/** This value is only used for debugging. */
public static int sleepingEntities = 0;

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

@ -198,8 +198,8 @@ public class Conveyor extends Block implements Autotiler{
e.nextc.xs[e.nextc.lastInserted] = e.xs[i];
}
//remove last item
e.items.remove(e.ids[i], e.len - i);
e.len = Math.min(i, e.len);
e.items.remove(e.ids[i], 1);
}else if(e.ys[i] < e.minitem){
e.minitem = e.ys[i];
}