Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Multiple bugfixes, addition of Logic class

Browse Source
This commit is contained in:
Anuken
2018-01-27 11:26:26 -05:00
parent 2784969685
commit 93cd497c8d
7 changed files with 174 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ public class Player extends SyncEntity{
public Player(){
hitbox.setSize(5);
hitboxTile.setSize(4f);
hitboxTile.setSize(5f);
maxhealth = 200;
heal();
@@ -144,8 +144,9 @@ public class Player extends SyncEntity{
Tile tile = world.tileWorld(x, y);
if(tile != null && tile.floor().liquid && tile.block() == Blocks.air){
damage(health+1); //drown
//if player is in solid block
if(tile != null && ((tile.floor().liquid && tile.block() == Blocks.air) || tile.solid())){
damage(health+1); //die instantly
}
vector.set(0, 0);