Merge fixes

2018-04-08 10:47:09 -04:00
parent 1789fadbf6
commit 30ddd91a34
2 changed files with 4 additions and 4 deletions
--- 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
 		}