From 4940c277f6b59161c1ce19c36680457e8f1fccf8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 28 Oct 2020 09:42:41 -0400
Subject: [PATCH] Fixed #3166

---
 core/src/mindustry/entities/comp/ShieldComp.java | 2 +-
 gradle.properties                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/comp/ShieldComp.java b/core/src/mindustry/entities/comp/ShieldComp.java
index 274286b801..d4a1ec7e4b 100644
--- a/core/src/mindustry/entities/comp/ShieldComp.java
+++ b/core/src/mindustry/entities/comp/ShieldComp.java
@@ -22,9 +22,9 @@ abstract class ShieldComp implements Healthc, Posc{
     @Replace
     @Override
     public void damage(float amount){
-        amount /= healthMultiplier;
         //apply armor
         amount = Math.max(amount - armor, minArmorDamage * amount);
+        amount /= healthMultiplier;
 
         hitTime = 1f;
 
diff --git a/gradle.properties b/gradle.properties
index 9863235bae..66f790efcc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=aac5351b3ebb9f598e02af6dcc1aaaa31994fa9b
+archash=3a1a8bbeca9a5a0552817bb7f6aa16c90bdf5605