Merged with master

core/src/io/anuke/mindustry/entities/BulletType.java

@@ -9,7 +9,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
 	public float knockback;
 	public StatusEffect status = StatusEffects.none;
 	public float statusIntensity = 0.5f;
-	
+
 	public BulletType(float speed, int damage){
 		this.speed = speed;
 		this.damage = damage;

core/src/io/anuke/mindustry/entities/Player.java

@@ -45,7 +45,6 @@ public class Player extends Unit{
 	public Mech mech = Mechs.standard;
 
 	public float targetAngle = 0f;
-	public float stucktime = 0f;
 	public boolean dashing = false;
 
 	public int clientid = -1;
@@ -58,7 +57,7 @@ public class Player extends Unit{
 	
 	public Player(){
 		hitbox.setSize(5);
-		hitboxTile.setSize(5f);
+		hitboxTile.setSize(4f);
 		
 		maxhealth = 200;
 		heal();
@@ -215,15 +214,8 @@ public class Player extends Unit{
 		Tile tile = world.tileWorld(x, y);
 
 		//if player is in solid block
-		if(tile != null && tile.solid()){
-			stucktime += Timers.delta();
-		}else{
-			stucktime = 0f;
-		}
-
-		if(stucktime > 15f){
-			damage(health+1); //die instantly
-			stucktime = 0f;
+		if(tile != null && tile.solid())) {
+			damage(health + 1); //die instantly
 		}
 
 		if(ui.chatfrag.chatOpen()) return;