Merge branch 'balancing-payload_system' of https://github.com/SomeonesShade/Mindustry into SomeonesShade-balancing-payload_system

This commit is contained in:
Anuken
2025-06-30 14:51:58 -04:00
3 changed files with 23 additions and 22 deletions

View File

@@ -228,7 +228,7 @@ public class PayloadLoader extends PayloadBlock{
return payload != null && (
exporting ||
(payload.block().hasLiquids && liquids.currentAmount() >= 0.1f && payload.build.liquids.currentAmount() >= payload.block().liquidCapacity - 0.001f) ||
(payload.block().hasItems && items.any() && payload.block().separateItemCapacity && content.items().contains(i -> payload.build.items.get(i) >= payload.block().itemCapacity)) ||
(payload.block().hasItems && items.any() && payload.block().separateItemCapacity && content.items().contains(i -> (payload.build.items.get(i) >= payload.block().itemCapacity) && items.has(i))) ||
(hasBattery() && payload.build.power.status >= 0.999999999f));
}