diff --git a/.travis.yml b/.travis.yml index 7efe1ecfc0..c97c9646db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,28 @@ language: android - jdk: - - openjdk8 - +- openjdk8 android: components: - - android-28 - - # Additional components - - extra-google-google_play_services - - extra-google-m2repository - - extra-android-m2repository - - addon-google_apis-google-28 - - build-tools-28.0.3 - + - android-28 + - extra-google-google_play_services + - extra-google-m2repository + - extra-android-m2repository + - addon-google_apis-google-28 + - build-tools-28.0.3 script: - - ./gradlew test - - ./gradlew desktop:dist - - ./gradlew server:dist - -after_success: - - chmod +x upload-build.sh - - chmod +x cleanup_builds.sh - - ./upload-build.sh +- "./gradlew test" +- "./gradlew desktop:dist" +- "./gradlew server:dist" +deploy: + provider: releases + skip_cleanup: true + draft: false + api_key: + secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg= + file: + - "desktop/build/libs/desktop-release.jar" + - "server/build/libs/server-release.jar" + on: + repo: Anuken/Mindustry + tags: true \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index bae29946cf..828e9d56f1 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -512,7 +512,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } Effects.effect(UnitFx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); } - mech.onLand(this); + if(!mech.flying) mech.onLand(this); achievedFlight = false; }