From 30ddd91a34b139c8ae51226a9b442b1bcfa28c19 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 8 Apr 2018 10:47:09 -0400 Subject: [PATCH] Merge fixes --- core/assets/version.properties | 6 +++--- core/src/io/anuke/mindustry/entities/Player.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/version.properties b/core/assets/version.properties index 4f88ebfec1..26d4eed8cb 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sun Apr 08 10:33:47 EDT 2018 +#Sun Apr 08 10:46:09 EDT 2018 version=release -androidBuildCode=870 +androidBuildCode=872 name=Mindustry -code=3.4 +code=3.5 build=custom build diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 72252f8ee1..4d83959e82 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -214,7 +214,7 @@ public class Player extends Unit{ Tile tile = world.tileWorld(x, y); //if player is in solid block - if(tile != null && tile.solid())) { + if(tile != null && tile.solid()) { damage(health + 1); //die instantly }