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

Merge branch 'master' of https://github.com/Anuken/Mindustry into steam

Browse Source
This commit is contained in:
Anuken
2019-08-23 14:05:46 -04:00
parent 4e43d2a96b d1e07ec0a2
commit cf9cda4936
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/maps/Maps.java
View File

@@ -215,7 +215,7 @@ public class Maps implements Disposable{
return filters;
}else{
try{
return JsonIO.read(Array.class, str);
return JsonIO.read(Array.class, str.replace("mindustrz", "mindustry"));
}catch(Exception e){
e.printStackTrace();
return readFilters("");

1
core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java
View File

@@ -17,7 +17,6 @@ public class MirrorFilter extends GenerateFilter{
{
options(new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45));
buffered = true;
}
@Override

2
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -106,7 +106,7 @@ public class PausedDialog extends FloatingDialog{
return;
}
if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || Net.client()){
if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || wasClient){
state.set(State.menu);
logic.reset();
return;