diff --git a/core/src/mindustry/service/GameService.java b/core/src/mindustry/service/GameService.java index 1429da3bcf..0356a80d25 100644 --- a/core/src/mindustry/service/GameService.java +++ b/core/src/mindustry/service/GameService.java @@ -158,7 +158,7 @@ public class GameService{ Events.on(UnitCreateEvent.class, e -> { if(campaign()){ if(unitsBuilt.add(e.unit.type.name)){ - SStat.unitTypesBuilt.set(content.units().count(u -> unitsBuilt.contains(u.name) && !u.isHidden())); + SStat.unitTypesBuilt.max(content.units().count(u -> unitsBuilt.contains(u.name) && !u.isHidden())); save(); } @@ -325,7 +325,7 @@ public class GameService{ } for(Building entity : player.team().cores()){ - if(!content.items().contains(i -> entity.items.get(i) < entity.block.itemCapacity)){ + if(!content.items().contains(i -> !state.rules.hiddenBuildItems.contains(i) && entity.items.get(i) < entity.block.itemCapacity)){ fillCoreAllCampaign.complete(); break; } diff --git a/gradle.properties b/gradle.properties index b3da1e740d..2cd0ac54a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=47925a7b91 +archash=7d543096d5