Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-03-30 10:24:57 -04:00
2 changed files with 2 additions and 2 deletions

View File

@@ -45,7 +45,7 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){
if(type.continuousDamage() > 0){
bt.add(Core.bundle.format("bullet.damage", type.continuousDamage()) + " " + StatUnit.perSecond.localized());
bt.add(Core.bundle.format("bullet.damage", type.continuousDamage()) + StatUnit.perSecond.localized());
}else{
bt.add(Core.bundle.format("bullet.damage", type.damage));
}