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

Unloader fix?

Browse Source
This commit is contained in:
Anuken
2022-03-16 10:31:01 -04:00
parent c5bf0f6768
commit 02f3386c5b
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/mindustry/world/blocks/storage/Unloader.java
View File

@ -63,6 +63,17 @@ public class Unloader extends Block{
boolean canLoad; boolean canLoad;
boolean canUnload; boolean canUnload;
int index; int index;
@Override
public String toString(){
return "ContainerStat{" +
"building=" + building.block + "#" + building.id +
", loadFactor=" + loadFactor +
", canLoad=" + canLoad +
", canUnload=" + canUnload +
", index=" + index +
'}';
}
} }
public class UnloaderBuild extends Building{ public class UnloaderBuild extends Building{
@ -76,7 +87,7 @@ public class Unloader extends Block{
protected final Comparator<ContainerStat> comparator = Structs.comps( protected final Comparator<ContainerStat> comparator = Structs.comps(
Structs.comps( Structs.comps(
Structs.comparingBool(e -> e.building.block.highUnloadPriority && !e.canLoad), Structs.comparingBool(e -> e.building.block.highUnloadPriority && !e.canLoad),
Structs.comparingBool(e -> e.canUnload && !e.canLoad) Structs.comparingBool(e -> e.canUnload) // && !e.canLoad
), ),
Structs.comps( Structs.comps(
Structs.comparingFloat(e -> e.loadFactor), Structs.comparingFloat(e -> e.loadFactor),
@ -171,7 +182,7 @@ public class Unloader extends Block{
} }
} }
//choose the building to give the item //choose the building to take the item from
for(int i = possibleBlocks.size - 1; i >= 0; i--){ for(int i = possibleBlocks.size - 1; i >= 0; i--){
if(possibleBlocks.get(i).canUnload){ if(possibleBlocks.get(i).canUnload){
dumpingFrom = possibleBlocks.get(i); dumpingFrom = possibleBlocks.get(i);
@ -181,10 +192,11 @@ public class Unloader extends Block{
//increment the priority if not used //increment the priority if not used
for(int i = 0; i < possibleBlocks.size; i++){ for(int i = 0; i < possibleBlocks.size; i++){
lastUsed[i] = (lastUsed[i] + 1 ) % 2147483647; lastUsed[i] = (lastUsed[i] + 1) % 2147483647;
} }
//trade the items //trade the items
//TODO && dumpingTo != dumpingFrom ?
if(dumpingFrom != null && dumpingTo != null && (dumpingFrom.loadFactor != dumpingTo.loadFactor || !dumpingFrom.canLoad)){ if(dumpingFrom != null && dumpingTo != null && (dumpingFrom.loadFactor != dumpingTo.loadFactor || !dumpingFrom.canLoad)){
dumpingTo.building.handleItem(this, item); dumpingTo.building.handleItem(this, item);
dumpingFrom.building.removeStack(item, 1); dumpingFrom.building.removeStack(item, 1);