Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed shields not capping properly

Browse Source
This commit is contained in:
Anuken
2021-09-18 20:39:43 -04:00
parent 66f56d9e98
commit 9dfb5888ec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java
View File

@@ -32,7 +32,7 @@ public class ShieldRegenFieldAbility extends Ability{
Units.nearby(unit.team, unit.x, unit.y, range, other -> { Units.nearby(unit.team, unit.x, unit.y, range, other -> {
if(other.shield < max){ if(other.shield < max){
other.shield = Math.max(other.shield + amount, max); other.shield = Math.min(other.shield + amount, max);
other.shieldAlpha = 1f; //TODO may not be necessary other.shieldAlpha = 1f; //TODO may not be necessary
applyEffect.at(unit.x, unit.y, 0f, unit.team.color, parentizeEffects ? other : null); applyEffect.at(unit.x, unit.y, 0f, unit.team.color, parentizeEffects ? other : null);
applied = true; applied = true;

2
gradle.properties
View File

@@ -11,4 +11,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
http.socketTimeout=80000 http.socketTimeout=80000
http.connectionTimeout=80000 http.connectionTimeout=80000
archash=c6da2092c281d948c7864f22385575184f82e4b4 archash=6f56e0a3a33c0c7752c8aff868df035cf242e7aa