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

Fixed #2238

Browse Source
This commit is contained in:
Anuken
2020-07-17 13:20:31 -04:00
parent 1bb621bbd5
commit 54e5d6a302
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/UnitTypes.java
View File

@@ -726,7 +726,7 @@ public class UnitTypes implements ContentList{
trailY = -4f; trailY = -4f;
trailScl = 2f; trailScl = 2f;
abilities.add(new StatusFieldAbility(StatusEffects.overclock, 60f * 10, 60f * 10f, 60f)); abilities.add(new StatusFieldAbility(StatusEffects.overclock, 60f * 6, 60f * 6f, 60f));
weapons.add(new Weapon("mount-weapon"){{ weapons.add(new Weapon("mount-weapon"){{
reload = 15f; reload = 15f;

2
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -415,7 +415,7 @@ public class JoinDialog extends BaseDialog{
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void loadServers(){ private void loadServers(){
servers = Core.settings.getJson("servers", Seq.class, Seq::new); servers = Core.settings.getJson("servers", Seq.class, Server.class, Seq::new);
//load imported legacy data //load imported legacy data
if(Core.settings.has("server-list")){ if(Core.settings.has("server-list")){