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

Fixed #7218

Browse Source
This commit is contained in:
Anuken
2022-07-21 21:23:02 -04:00
parent da1103a2c0
commit 5ae204dd22
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/service/GameService.java
View File

@@ -158,7 +158,7 @@ public class GameService{
Events.on(UnitCreateEvent.class, e -> { Events.on(UnitCreateEvent.class, e -> {
if(campaign()){ if(campaign()){
if(unitsBuilt.add(e.unit.type.name)){ 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(); save();
} }
@@ -325,7 +325,7 @@ public class GameService{
} }
for(Building entity : player.team().cores()){ 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(); fillCoreAllCampaign.complete();
break; break;
} }

2
gradle.properties
View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=47925a7b91 archash=7d543096d5