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

Fixed #3973

Browse Source
This commit is contained in:
Anuken
2020-12-13 23:40:06 -05:00
parent 901c23f295
commit bbf84185cc
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -766,9 +766,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
sector.isBeingPlayed() ? "@sectors.resume" : sector.isBeingPlayed() ? "@sectors.resume" :
sector.hasBase() ? "@sectors.go" : sector.hasBase() ? "@sectors.go" :
locked ? "@locked" : "@sectors.launch", locked ? "@locked" : "@sectors.launch",
locked ? Icon.lock : Icon.play, () -> { locked ? Icon.lock : Icon.play, this::playSelected).growX().height(54f).minWidth(170f).padTop(4).disabled(locked);
playSelected();
}).growX().height(54f).minWidth(170f).padTop(4).disabled(locked);
} }
stable.pack(); stable.pack();

5
desktop/src/mindustry/desktop/steam/SStats.java
View File

@@ -25,6 +25,7 @@ public class SStats implements SteamUserStatsCallback{
private ObjectSet<String> blocksBuilt = new ObjectSet<>(), unitsBuilt = new ObjectSet<>(); private ObjectSet<String> blocksBuilt = new ObjectSet<>(), unitsBuilt = new ObjectSet<>();
private ObjectSet<UnitType> t5s = new ObjectSet<>(); private ObjectSet<UnitType> t5s = new ObjectSet<>();
private IntSet checked = new IntSet();
public SStats(){ public SStats(){
stats.requestCurrentStats(); stats.requestCurrentStats();
@@ -136,9 +137,11 @@ public class SStats implements SteamUserStatsCallback{
} }
if(e.tile.block() instanceof Conveyor){ if(e.tile.block() instanceof Conveyor){
checked.clear();
check: { check: {
Tile current = e.tile; Tile current = e.tile;
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
checked.add(current.pos());
if(current.build == null) break check; if(current.build == null) break check;
Tile next = current.nearby(current.build.rotation); Tile next = current.nearby(current.build.rotation);
if(next != null && next.block() instanceof Conveyor){ if(next != null && next.block() instanceof Conveyor){
@@ -148,7 +151,7 @@ public class SStats implements SteamUserStatsCallback{
} }
} }
if(current == e.tile){ if(current == e.tile && checked.size == 4){
circleConveyor.complete(); circleConveyor.complete();
} }
} }