From 4d889cd8d126c3e66f957ea43c82cd534873638d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 10 Oct 2020 17:09:19 -0400
Subject: [PATCH] Weather fixes

---
 core/src/mindustry/content/UnitTypes.java | 2 +-
 core/src/mindustry/content/Weathers.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 17ec827055..f98676f156 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1231,7 +1231,7 @@ public class UnitTypes implements ContentList{
         }};
 
         quad = new UnitType("quad"){{
-            armor = 6f;
+            armor = 8f;
             health = 6000;
             speed = 1.2f;
             rotateSpeed = 2f;
diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java
index a2ffbb098f..273fdb5899 100644
--- a/core/src/mindustry/content/Weathers.java
+++ b/core/src/mindustry/content/Weathers.java
@@ -152,7 +152,7 @@ public class Weathers implements ContentList{
                         if(tile != null && tile.floor().liquidDrop == Liquids.water){
                             Draw.color(Tmp.c1.set(tile.floor().mapColor).mul(1.5f).a(state.opacity()));
                             Draw.rect(splashes[(int)(life * (splashes.length - 1))], x, y);
-                        }else{
+                        }else if(tile != null && tile.floor().liquidDrop == null && !tile.floor().solid){
                             Draw.color(Color.royal, Color.white, 0.3f);
                             Draw.alpha(Mathf.slope(life) * state.opacity());