mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Anuken 2018-04-08 10:47:09 -04:00
parent 1789fadbf6
commit 30ddd91a34
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/assets/version.properties
View File

@ -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

2
core/src/io/anuke/mindustry/entities/Player.java
View File

@ -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
}