mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 11:29:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2020-03-04 09:01:41 -05:00
parent 503607e36a
commit c96427c722
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/core/Control.java
View File

@ -3,12 +3,12 @@ package mindustry.core;
import arc.*;
import arc.assets.*;
import arc.audio.*;
import arc.struct.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.input.*;
import arc.math.geom.*;
import arc.scene.ui.*;
import arc.struct.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.core.GameState.*;
@ -114,7 +114,7 @@ public class Control implements ApplicationListener, Loadable{
});
//autohost for pvp maps
Events.on(WorldLoadEvent.class, event -> {
Events.on(WorldLoadEvent.class, event -> app.post(() -> {
if(state.rules.pvp && !net.active()){
try{
net.host(port);
@ -124,7 +124,7 @@ public class Control implements ApplicationListener, Loadable{
Core.app.post(() -> state.set(State.menu));
}
}
});
}));
Events.on(UnlockEvent.class, e -> ui.hudfrag.showUnlock(e.content));

1
core/src/mindustry/mod/Mods.java
View File

@ -21,6 +21,7 @@ import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.graphics.MultiPacker.*;
import mindustry.plugin.*;
import mindustry.type.*;
import mindustry.ui.*;

1
core/src/mindustry/ui/dialogs/CustomGameDialog.java
View File

@ -73,7 +73,6 @@ public class CustomGameDialog extends FloatingDialog{
image.row();
image.add(img).size(images);
BorderImage border = new BorderImage(map.safeTexture(), 3f);
border.setScaling(Scaling.fit);
image.replaceImage(border);

19
desktop/src/mindustry/desktop/steam/SNet.java
View File

@ -1,16 +1,16 @@
package mindustry.desktop.steam;
import arc.*;
import arc.func.*;
import arc.struct.*;
import arc.util.*;
import arc.util.pooling.*;
import com.codedisaster.steamworks.*;
import com.codedisaster.steamworks.SteamFriends.*;
import com.codedisaster.steamworks.SteamMatchmaking.*;
import com.codedisaster.steamworks.SteamNetworking.*;
import arc.struct.*;
import arc.func.*;
import arc.util.*;
import arc.util.pooling.*;
import mindustry.core.GameState.*;
import mindustry.core.Version;
import mindustry.core.*;
import mindustry.game.EventType.*;
import mindustry.game.*;
import mindustry.net.ArcNetProvider.*;
@ -240,12 +240,9 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
return;
}
if(net.active()){
net.disconnect();
net.closeServer();
logic.reset();
state.set(State.menu);
}
logic.reset();
net.reset();
state.set(State.menu);
currentLobby = steamIDLobby;
currentServer = smat.getLobbyOwner(steamIDLobby);