diff --git a/.travis.yml b/.travis.yml
index 58473d0aaf..f526813775 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ script:
 - git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
 - cd ../MindustryBuilds
 - echo ${TRAVIS_BUILD_NUMBER} > version.txt
+- TEST_TAG=v9999
+- echo versionName=4-fdroid-${TEST_TAG}$'\n'versionCode=${TEST_TAG:1} > version_fdroid.txt
 - git add .
 - git commit -m "Updating to build ${TRAVIS_BUILD_NUMBER}"
 - git tag ${TRAVIS_BUILD_NUMBER}
diff --git a/core/assets/maps/stainedMountains.msav b/core/assets/maps/stainedMountains.msav
index fabee936e8..07d2d6ad81 100644
Binary files a/core/assets/maps/stainedMountains.msav and b/core/assets/maps/stainedMountains.msav differ
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index b7cc79ac63..8ed55c2e10 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -267,7 +267,7 @@ public class Renderer implements ApplicationListener{
         }
 
         overlays.drawBottom();
-        playerGroup.draw(p -> true, Player::drawBuildRequests);
+        playerGroup.draw(p -> p.isLocal, Player::drawBuildRequests);
 
         if(shieldGroup.countInBounds() > 0){
             if(settings.getBool("animatedshields") && Shaders.shield != null){
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
index 1c6c059e76..4b90693a8e 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
@@ -11,7 +11,6 @@ import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
@@ -138,10 +137,10 @@ public class CoreBlock extends StorageBlock{
     }
 
     public class CoreEntity extends TileEntity implements SpawnerTrait{
-        public Player spawnPlayer;
-        float progress;
-        float time;
-        float heat;
+        protected Player spawnPlayer;
+        protected float progress;
+        protected float time;
+        protected float heat;
 
         @Override
         public boolean hasUnit(Unit unit){