mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-26 07:37:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

/sync command

Browse Source
This commit is contained in:
Anuken
2019-08-31 10:14:26 -04:00
parent 3414026828
commit 5f361413bb
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/Control.java
View File

@ -66,7 +66,7 @@ public class Control implements ApplicationListener, Loadable{
Core.app.post(() -> Core.app.post(() -> {
if(Net.active() && player.getClosestCore() != null){
//set to closest core since that's where the player will probably respawn; prevents camera jumps
Core.camera.position.set(player.getClosestCore());
Core.camera.position.set(player.isDead() ? player.getClosestCore() : player);
}else{
//locally, set to player position since respawning occurs immediately
Core.camera.position.set(player);

9
core/src/io/anuke/mindustry/core/NetServer.java
View File

@ -320,6 +320,15 @@ public class NetServer implements ApplicationListener{
}
}
});
clientCommands.<Player>register("sync", "Re-synchronize world state.", (args, player) -> {
if(player.isLocal){
player.sendMessage("[scarlet]Re-synchronizing as the host is pointless.");
}else{
Call.onWorldDataBegin(player.con.id);
netServer.sendWorldData(player, player.con.id);
}
});
}
public int votesRequired(){

3
server/src/io/anuke/mindustry/server/ServerLauncher.java
View File

@ -2,6 +2,8 @@ package io.anuke.mindustry.server;
import io.anuke.arc.backends.headless.HeadlessApplication;
import io.anuke.mindustry.*;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.net.*;
public class ServerLauncher{
@ -10,6 +12,7 @@ public class ServerLauncher{
try{
Net.setClientProvider(new ArcNetClient());
Net.setServerProvider(new ArcNetServer());
Vars.platform = new Platform(){};
new HeadlessApplication(new MindustryServer(args), null, throwable -> CrashSender.send(throwable, f -> {}));
}catch(Throwable t){
CrashSender.send(t, f -> {});