Merge branch 'master' into cleanup-2

2020-11-09 20:21:01 +04:00
parent 9f979cba0d acb14a0986
commit f84e780f3b
106 changed files with 328 additions and 249 deletions
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -207,7 +207,7 @@ public abstract class BulletType extends Content{
            Damage.createIncend(x, y, incendSpread, incendAmount);
        }

-        if(splashDamageRadius > 0){
+        if(splashDamageRadius > 0 && !b.absorbed){
            Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * b.damageMultiplier(), collidesAir, collidesGround);

            if(status != StatusEffects.none){