mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-03-14 03:49:13 +07:00
Bugfixes
This commit is contained in:
parent
503607e36a
commit
c96427c722
core/src/mindustry
desktop/src/mindustry/desktop/steam
@ -3,12 +3,12 @@ package mindustry.core;
|
|||||||
import arc.*;
|
import arc.*;
|
||||||
import arc.assets.*;
|
import arc.assets.*;
|
||||||
import arc.audio.*;
|
import arc.audio.*;
|
||||||
import arc.struct.*;
|
|
||||||
import arc.graphics.*;
|
import arc.graphics.*;
|
||||||
import arc.graphics.g2d.*;
|
import arc.graphics.g2d.*;
|
||||||
import arc.input.*;
|
import arc.input.*;
|
||||||
import arc.math.geom.*;
|
import arc.math.geom.*;
|
||||||
import arc.scene.ui.*;
|
import arc.scene.ui.*;
|
||||||
|
import arc.struct.*;
|
||||||
import arc.util.*;
|
import arc.util.*;
|
||||||
import mindustry.content.*;
|
import mindustry.content.*;
|
||||||
import mindustry.core.GameState.*;
|
import mindustry.core.GameState.*;
|
||||||
@ -114,7 +114,7 @@ public class Control implements ApplicationListener, Loadable{
|
|||||||
});
|
});
|
||||||
|
|
||||||
//autohost for pvp maps
|
//autohost for pvp maps
|
||||||
Events.on(WorldLoadEvent.class, event -> {
|
Events.on(WorldLoadEvent.class, event -> app.post(() -> {
|
||||||
if(state.rules.pvp && !net.active()){
|
if(state.rules.pvp && !net.active()){
|
||||||
try{
|
try{
|
||||||
net.host(port);
|
net.host(port);
|
||||||
@ -124,7 +124,7 @@ public class Control implements ApplicationListener, Loadable{
|
|||||||
Core.app.post(() -> state.set(State.menu));
|
Core.app.post(() -> state.set(State.menu));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}));
|
||||||
|
|
||||||
Events.on(UnlockEvent.class, e -> ui.hudfrag.showUnlock(e.content));
|
Events.on(UnlockEvent.class, e -> ui.hudfrag.showUnlock(e.content));
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ import mindustry.game.EventType.*;
|
|||||||
import mindustry.gen.*;
|
import mindustry.gen.*;
|
||||||
import mindustry.graphics.*;
|
import mindustry.graphics.*;
|
||||||
import mindustry.graphics.MultiPacker.*;
|
import mindustry.graphics.MultiPacker.*;
|
||||||
|
import mindustry.plugin.*;
|
||||||
import mindustry.type.*;
|
import mindustry.type.*;
|
||||||
import mindustry.ui.*;
|
import mindustry.ui.*;
|
||||||
|
|
||||||
|
@ -73,7 +73,6 @@ public class CustomGameDialog extends FloatingDialog{
|
|||||||
image.row();
|
image.row();
|
||||||
image.add(img).size(images);
|
image.add(img).size(images);
|
||||||
|
|
||||||
|
|
||||||
BorderImage border = new BorderImage(map.safeTexture(), 3f);
|
BorderImage border = new BorderImage(map.safeTexture(), 3f);
|
||||||
border.setScaling(Scaling.fit);
|
border.setScaling(Scaling.fit);
|
||||||
image.replaceImage(border);
|
image.replaceImage(border);
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
package mindustry.desktop.steam;
|
package mindustry.desktop.steam;
|
||||||
|
|
||||||
import arc.*;
|
import arc.*;
|
||||||
|
import arc.func.*;
|
||||||
|
import arc.struct.*;
|
||||||
|
import arc.util.*;
|
||||||
|
import arc.util.pooling.*;
|
||||||
import com.codedisaster.steamworks.*;
|
import com.codedisaster.steamworks.*;
|
||||||
import com.codedisaster.steamworks.SteamFriends.*;
|
import com.codedisaster.steamworks.SteamFriends.*;
|
||||||
import com.codedisaster.steamworks.SteamMatchmaking.*;
|
import com.codedisaster.steamworks.SteamMatchmaking.*;
|
||||||
import com.codedisaster.steamworks.SteamNetworking.*;
|
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.GameState.*;
|
||||||
import mindustry.core.Version;
|
import mindustry.core.*;
|
||||||
import mindustry.game.EventType.*;
|
import mindustry.game.EventType.*;
|
||||||
import mindustry.game.*;
|
import mindustry.game.*;
|
||||||
import mindustry.net.ArcNetProvider.*;
|
import mindustry.net.ArcNetProvider.*;
|
||||||
@ -240,12 +240,9 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(net.active()){
|
|
||||||
net.disconnect();
|
|
||||||
net.closeServer();
|
|
||||||
logic.reset();
|
logic.reset();
|
||||||
|
net.reset();
|
||||||
state.set(State.menu);
|
state.set(State.menu);
|
||||||
}
|
|
||||||
|
|
||||||
currentLobby = steamIDLobby;
|
currentLobby = steamIDLobby;
|
||||||
currentServer = smat.getLobbyOwner(steamIDLobby);
|
currentServer = smat.getLobbyOwner(steamIDLobby);
|
||||||
|
Loading…
Reference in New Issue
Block a user