mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-12-06 02:40:23 -08:00
Fixed #11384
This commit is contained in:
parent
43d4deb801
commit
460d3a0b44
2 changed files with 3 additions and 3 deletions
|
|
@ -86,7 +86,7 @@ public class CustomRulesDialog extends BaseDialog{
|
||||||
//objectives and spawns are considered to be map-specific; don't use them
|
//objectives and spawns are considered to be map-specific; don't use them
|
||||||
newRules.spawns = rules.spawns;
|
newRules.spawns = rules.spawns;
|
||||||
newRules.objectives = rules.objectives;
|
newRules.objectives = rules.objectives;
|
||||||
rules = newRules;
|
JsonIO.copy(newRules, rules);
|
||||||
refresh();
|
refresh();
|
||||||
}catch(Throwable e){
|
}catch(Throwable e){
|
||||||
Log.err(e);
|
Log.err(e);
|
||||||
|
|
@ -96,7 +96,7 @@ public class CustomRulesDialog extends BaseDialog{
|
||||||
}).disabled(Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith("{")).marginLeft(12f).row();
|
}).disabled(Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith("{")).marginLeft(12f).row();
|
||||||
|
|
||||||
t.button("@settings.reset", Icon.refresh, style, () -> {
|
t.button("@settings.reset", Icon.refresh, style, () -> {
|
||||||
rules = resetter.get();
|
JsonIO.copy(resetter.get(), rules);
|
||||||
refresh();
|
refresh();
|
||||||
}).marginLeft(12f);
|
}).marginLeft(12f);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,4 @@ org.gradle.caching=true
|
||||||
org.gradle.internal.http.socketTimeout=100000
|
org.gradle.internal.http.socketTimeout=100000
|
||||||
org.gradle.internal.http.connectionTimeout=100000
|
org.gradle.internal.http.connectionTimeout=100000
|
||||||
android.enableR8.fullMode=false
|
android.enableR8.fullMode=false
|
||||||
archash=6d94644c8b
|
archash=52269919b2
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue