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

Game state cleanup

Browse Source
This commit is contained in:
Anuken
2020-03-31 14:16:38 -04:00
parent 9081f3ff03
commit f1fd072400
20 changed files with 51 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/net/ArcNetProvider.java
View File

@@ -58,7 +58,7 @@ public class ArcNetProvider implements NetProvider{
Core.app.post(() -> {
try{
net.handleClientReceived(object);
}catch(Exception e){
}catch(Throwable e){
handleException(e);
}
});
@@ -113,9 +113,7 @@ public class ArcNetProvider implements NetProvider{
Core.app.post(() -> {
try{
net.handleServerReceived(k, object);
}catch(RuntimeException e){
e.printStackTrace();
}catch(Exception e){
}catch(Throwable e){
e.printStackTrace();
}
});
@@ -267,7 +265,7 @@ public class ArcNetProvider implements NetProvider{
return null;
}
private void handleException(Exception e){
private void handleException(Throwable e){
if(e instanceof ArcNetException){
Core.app.post(() -> net.showError(new IOException("mismatch")));
}else if(e instanceof ClosedChannelException){

6
core/src/mindustry/net/NetworkIO.java
View File

@@ -21,7 +21,7 @@ public class NetworkIO{
try(DataOutputStream stream = new DataOutputStream(os)){
stream.writeUTF(JsonIO.write(state.rules));
SaveIO.getSaveWriter().writeStringMap(stream, world.getMap().tags);
SaveIO.getSaveWriter().writeStringMap(stream, state.map.tags);
stream.writeInt(state.wave);
stream.writeFloat(state.wavetime);
@@ -41,7 +41,7 @@ public class NetworkIO{
try(DataInputStream stream = new DataInputStream(is)){
Time.clear();
state.rules = JsonIO.read(Rules.class, stream.readUTF());
world.setMap(new Map(SaveIO.getSaveWriter().readStringMap(stream)));
state.map = new Map(SaveIO.getSaveWriter().readStringMap(stream));
state.wave = stream.readInt();
state.wavetime = stream.readFloat();
@@ -65,7 +65,7 @@ public class NetworkIO{
public static ByteBuffer writeServerData(){
String name = (headless ? Config.name.string() : player.name());
String description = headless && !Config.desc.string().equals("off") ? Config.desc.string() : "";
String map = world.getMap() == null ? "None" : world.getMap().name();
String map = state.map.name();
ByteBuffer buffer = ByteBuffer.allocate(512);