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

Partial teleporter item stacking fix.

Browse Source
This commit is contained in:
Anuken
2018-02-16 11:32:01 -05:00
parent b70f5b82ee
commit fe3eb356fa
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Thu Feb 15 19:14:34 EST 2018 #Fri Feb 16 11:30:06 EST 2018
version=beta version=beta
androidBuildCode=230 androidBuildCode=234
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=22 build=custom build

4
core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java
View File

@@ -163,6 +163,10 @@ public class Conveyor extends Block{
long result = ItemPos.packItem(item, y*0.9f, pos, (byte)Mathf.random(255)); long result = ItemPos.packItem(item, y*0.9f, pos, (byte)Mathf.random(255));
boolean inserted = false; boolean inserted = false;
if(pos <= 0.00001f && entity.minitem <= 0.001f){
return; //TODO low fps stacked items: what now?
}
for(int i = 0; i < entity.convey.size; i ++){ for(int i = 0; i < entity.convey.size; i ++){
if(compareItems(result, entity.convey.get(i)) < 0){ if(compareItems(result, entity.convey.get(i)) < 0){
entity.convey.insert(i, result); entity.convey.insert(i, result);