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

Clamp

Browse Source
This commit is contained in:
Anuken
2020-01-26 15:13:55 -05:00
parent 6fe2697185
commit 9a3245c23e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,7 @@ public class Conveyor extends Block implements Autotiler{
for(int i = e.len - 1; i >= 0; i--){ for(int i = e.len - 1; i >= 0; i--){
float nextpos = (i == e.len - 1 ? 100f : e.ys[i + 1]) - itemSpace; float nextpos = (i == e.len - 1 ? 100f : e.ys[i + 1]) - itemSpace;
float maxmove = Math.min(nextpos - e.ys[i], speed * e.delta()); float maxmove = Mathf.clamp(nextpos - e.ys[i], 0, speed * e.delta());
e.ys[i] += maxmove; e.ys[i] += maxmove;
@@ -362,16 +362,18 @@ public class Conveyor extends Block implements Autotiler{
@Override @Override
public void read(DataInput stream, byte revision) throws IOException{ public void read(DataInput stream, byte revision) throws IOException{
super.read(stream, revision); super.read(stream, revision);
len = Math.min(stream.readInt(), capacity); len = stream.readInt();
for(int i = 0; i < len; i++){ for(int i = 0; i < len; i++){
int val = stream.readInt(); int val = stream.readInt();
byte id = (byte)(val >> 24); byte id = (byte)(val >> 24);
float x = (float)((byte)(val >> 16)) / 127f; float x = (float)((byte)(val >> 16)) / 127f;
float y = ((float)((byte)(val >> 8)) + 128f) / 255f; float y = ((float)((byte)(val >> 8)) + 128f) / 255f;
ids[i] = content.item(id); if(i < capacity){
xs[i] = x; ids[i] = content.item(id);
ys[i] = i; xs[i] = x;
ys[i] = y;
}
} }
} }
} }