mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-24 21:48:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #3166

Browse Source
This commit is contained in:
Anuken 2020-10-28 09:42:41 -04:00
parent 63e4bca098
commit 4940c277f6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/ShieldComp.java
View File

@ -22,9 +22,9 @@ abstract class ShieldComp implements Healthc, Posc{
@Replace @Replace
@Override @Override
public void damage(float amount){ public void damage(float amount){
amount /= healthMultiplier;
//apply armor //apply armor
amount = Math.max(amount - armor, minArmorDamage * amount); amount = Math.max(amount - armor, minArmorDamage * amount);
amount /= healthMultiplier;
hitTime = 1f; hitTime = 1f;

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=aac5351b3ebb9f598e02af6dcc1aaaa31994fa9b archash=3a1a8bbeca9a5a0552817bb7f6aa16c90bdf5605