From 20032def7ef6d784f3d7add19ed9c78685215f74 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 8 Nov 2018 16:30:56 -0500
Subject: [PATCH] Fixed player turning white before drowning on multiplayer

---
 core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java | 2 +-
 core/src/io/anuke/mindustry/entities/Player.java             | 2 +-
 core/src/io/anuke/mindustry/entities/Unit.java               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
index 4333317e7a..a9e9f97155 100644
--- a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
@@ -30,7 +30,7 @@ public class LiquidBlocks extends BlockList implements ContentList{
 
         thermalPump = new Pump("thermal-pump"){{
             shadow = "shadow-rounded-2";
-            pumpAmount = 0.3f;
+            pumpAmount = 0.275f;
             consumes.power(0.03f);
             liquidCapacity = 40f;
             hasPower = true;
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 587b3a0125..8e4dc2f682 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -323,7 +323,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         }
 
         if(floor.isLiquid){
-            Draw.tint(Color.WHITE, floor.liquidColor, Mathf.clamp(drownTime, 0, 0.99f));
+            Draw.tint(Color.WHITE, floor.liquidColor, drownTime);
         }else{
             Draw.tint(Color.WHITE);
         }
diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java
index 62e1d20232..e7d4644401 100644
--- a/core/src/io/anuke/mindustry/entities/Unit.java
+++ b/core/src/io/anuke/mindustry/entities/Unit.java
@@ -276,7 +276,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
 
             drownTime = Mathf.clamp(drownTime);
 
-            if(drownTime >= 0.999f){
+            if(drownTime >= 0.999f && !Net.client()){
                 damage(health + 1);
             }