Testing improved deployment script

.travis.yml

@@ -5,17 +5,9 @@ script:
 - "./gradlew test"
 - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
 - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
-- git config --global user.name "Wiki Updater"
+
-- git clone --depth=1 --branch=master https://github.com/MindustryGame/wiki ../wiki
-- git clone --depth=1 --branch=master https://github.com/Anuken/Mindustry-Wiki-Generator ../Mindustry-Wiki-Generator
-- cd ../Mindustry-Wiki-Generator
-- "./gradlew run"
-- cd ../wiki
-- git add .
-- git commit -m "Update to match commit ${TRAVIS_COMMIT}"
-- git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/wiki
 deploy:
-  provider: releases
+  - provider: releases
     skip_cleanup: true
     draft: false
     api_key:
@@ -26,6 +18,8 @@ deploy:
     on:
       repo: Anuken/Mindustry
       tags: true
+  - provider: script
+    script: bash update_wiki.sh
 env:
   global:
     secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=

core/src/io/anuke/mindustry/io/SaveVersion.java

@@ -7,7 +7,6 @@ import io.anuke.mindustry.entities.Entities;
 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Teams.TeamData;
 import io.anuke.mindustry.gen.BrokenBlock;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.type.ContentType;
@@ -65,7 +64,6 @@ public abstract class SaveVersion extends SaveFileReader{
             "wavetime", state.wavetime,
             "stats", JsonIO.write(state.stats),
             "rules", JsonIO.write(state.rules),
-            "teamdata", JsonIO.write(state.teams.getActive().toArray(TeamData.class)),
             "width", world.width(),
             "height", world.height()
         ).merge(tags));
@@ -80,12 +78,6 @@ public abstract class SaveVersion extends SaveFileReader{
         state.rules = JsonIO.read(Rules.class, map.get("rules", "{}"));
         if(state.rules.spawns.isEmpty()) state.rules.spawns = defaultWaves.get();
 
-        //only broken blocks are transferred over right now; nothing else
-        TeamData[] teams = JsonIO.read(TeamData[].class, map.get("teamdata", "[]"));
-        for(TeamData data : teams){
-            state.teams.get(data.team).brokenBlocks = data.brokenBlocks;
-        }
-
         Map worldmap = world.maps.byName(map.get("mapname", "\\\\\\"));
         world.setMap(worldmap == null ? new Map(StringMap.of(
             "name", map.get("mapname", "Unknown"),

update_wiki.sh

@@ -0,0 +1,9 @@
+git config --global user.name "Wiki Updater"
+git clone --depth=1 --branch=master https://github.com/MindustryGame/wiki ../wiki
+git clone --depth=1 --branch=master https://github.com/Anuken/Mindustry-Wiki-Generator ../Mindustry-Wiki-Generator
+cd ../Mindustry-Wiki-Generator
+"./gradlew run"
+cd ../wiki
+git add .
+git commit -m "Update to match commit ${TRAVIS_COMMIT}"
+git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/wiki