From 2231062c19e8a9ba8f00792fae806df634829536 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 12 Sep 2019 17:19:01 -0400 Subject: [PATCH] Travis testing --- .travis.yml | 2 ++ core/assets/maps/stainedMountains.msav | Bin 15652 -> 15713 bytes .../src/io/anuke/mindustry/core/Renderer.java | 2 +- .../world/blocks/storage/CoreBlock.java | 9 ++++----- 4 files changed, 7 insertions(+), 6 deletions(-) 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 fabee936e8d2b5a8c1677a9811a6fad0cf6bed1f..07d2d6ad81b030162f74188c594ff1260a7f1c7c 100644 GIT binary patch delta 14428 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 delta 14425 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 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){