From b83723701f0e03625a229089613676c0a4522fba Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Tue, 23 Aug 2022 12:19:53 -0700 Subject: [PATCH] Is this better? I don't know much about optimization, is this any better than before? --- core/src/mindustry/entities/bullet/BulletType.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 9a43f5a001..5adf0cbdc8 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -417,7 +417,7 @@ public class BulletType extends Content implements Cloneable{ public void createSplashDamage(Bullet b, float x, float y){ if(splashDamageRadius > 0 && !b.absorbed){ - Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * b.damageMultiplier(), false, collidesAir, collidesGround, scaledSplashDamage, b); + Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * damageMultiplier(b), false, collidesAir, collidesGround, scaledSplashDamage, b); if(status != StatusEffects.none){ Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround); @@ -719,7 +719,7 @@ public class BulletType extends Content implements Cloneable{ bullet.drag = drag; bullet.hitSize = hitSize; bullet.mover = mover; - bullet.damage = (damage < 0 ? this.damage : damage) * bullet.damageMultiplier(); + bullet.damage = (damage < 0 ? this.damage : damage) * damageMultiplier(bullet); //reset trail if(bullet.trail != null){ bullet.trail.clear();