Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00
parent ea75a357ca
commit 28b235ef07
531 changed files with 12356 additions and 6286 deletions
--- a/core/src/mindustry/net/NetworkIO.java
+++ b/core/src/mindustry/net/NetworkIO.java
@@ -46,6 +46,7 @@ public class NetworkIO{

            SaveIO.getSaveWriter().writeContentHeader(stream);
            SaveIO.getSaveWriter().writeMap(stream);
+            SaveIO.getSaveWriter().writeTeamBlocks(stream);
        }catch(IOException e){
            throw new RuntimeException(e);
        }
@@ -70,6 +71,7 @@ public class NetworkIO{

            SaveIO.getSaveWriter().readContentHeader(stream);
            SaveIO.getSaveWriter().readMap(stream, world.context);
+            SaveIO.getSaveWriter().readTeamBlocks(stream);
        }catch(IOException e){
            throw new RuntimeException(e);
        }finally{