Merge remote-tracking branch 'origin/master'

2020-12-18 12:41:23 -05:00
parent bd25294096 a8bae56b2c
commit 5de2c0c512
1 changed files with 1 additions and 1 deletions
--- a/core/src/mindustry/entities/comp/ShieldComp.java
+++ b/core/src/mindustry/entities/comp/ShieldComp.java
@@ -14,7 +14,7 @@ abstract class ShieldComp implements Healthc, Posc{

    /** Absorbs health damage. */
    float shield;
-    /** Absorbs percentage of damage. */
+    /** Substracts an amount from damage. */
    float armor;
    /** Shield opacity. */
    transient float shieldAlpha = 0f;