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

Fixed random collision deaths

Browse Source
This commit is contained in:
Anuken 2018-03-30 19:18:33 -04:00
parent 84548187f5
commit ed276ac79e
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -25,7 +25,7 @@ allprojects {
appName = 'Mindustry'
gdxVersion = '1.9.8'
aiVersion = '1.8.1'
uCoreVersion = '1d4cc71'
uCoreVersion = 'd7c7094'
getVersionString = {
String buildVersion = getBuildVersion()

4
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify.
#Fri Mar 30 18:03:34 EDT 2018
#Fri Mar 30 19:18:12 EDT 2018
version=release
androidBuildCode=478
androidBuildCode=482
name=Mindustry
code=3.5
build=custom build

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

@ -42,7 +42,6 @@ public class Player extends SyncEntity{
public Mech mech = Mech.standard;
public float targetAngle = 0f;
public float stucktime = 0f;
public boolean dashing = false;
public int clientid = -1;
@ -54,7 +53,7 @@ public class Player extends SyncEntity{
public Player(){
hitbox.setSize(5);
hitboxTile.setSize(5f);
hitboxTile.setSize(4f);
maxhealth = 200;
heal();
@ -161,15 +160,8 @@ public class Player extends SyncEntity{
Tile tile = world.tileWorld(x, y);
//if player is in solid block
if(tile != null && ((tile.floor().liquid && tile.block() == Blocks.air) || tile.solid())){
stucktime += Timers.delta();
}else{
stucktime = 0f;
}
if(stucktime > 15f){
damage(health+1); //die instantly
stucktime = 0f;
if(tile != null && ((tile.floor().liquid && tile.block() == Blocks.air) || tile.solid())) {
damage(health + 1); //die instantly
}
if(ui.chatfrag.chatOpen()) return;