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

Fixed player turning white before drowning on multiplayer

Browse Source
This commit is contained in:
Anuken
2018-11-08 16:30:56 -05:00
parent 94706460c0
commit 20032def7e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
View File

@@ -30,7 +30,7 @@ public class LiquidBlocks extends BlockList implements ContentList{
thermalPump = new Pump("thermal-pump"){{ thermalPump = new Pump("thermal-pump"){{
shadow = "shadow-rounded-2"; shadow = "shadow-rounded-2";
pumpAmount = 0.3f; pumpAmount = 0.275f;
consumes.power(0.03f); consumes.power(0.03f);
liquidCapacity = 40f; liquidCapacity = 40f;
hasPower = true; hasPower = true;

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

@@ -323,7 +323,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
} }
if(floor.isLiquid){ if(floor.isLiquid){
Draw.tint(Color.WHITE, floor.liquidColor, Mathf.clamp(drownTime, 0, 0.99f)); Draw.tint(Color.WHITE, floor.liquidColor, drownTime);
}else{ }else{
Draw.tint(Color.WHITE); Draw.tint(Color.WHITE);
} }

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

@@ -276,7 +276,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
drownTime = Mathf.clamp(drownTime); drownTime = Mathf.clamp(drownTime);
if(drownTime >= 0.999f){ if(drownTime >= 0.999f && !Net.client()){
damage(health + 1); damage(health + 1);
} }