From 43e857e810e19fea1418dbf4c79972ba4bb4ce84 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 11 Jan 2022 06:29:25 -0800 Subject: [PATCH] Fix ammo of one item transforming into another. (#6483) * Fix ammo transmutation * Small fixes * small fix 2 * a * commit spam aeugh --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index c5b7c1b903..05f25a7cd0 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -420,7 +420,7 @@ public class Turret extends ReloadTurret{ Time.run(burstSpacing * i, () -> { if(dead || !hasAmmo()) return; tr.trns(rotation, shootLength, Mathf.range(xRand)); - bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy) + (ii - (int)(shots / 2f)) * spread); + bullet(peekAmmo(), rotation + Mathf.range(inaccuracy + peekAmmo().inaccuracy) + (ii - (int)(shots / 2f)) * spread); effects(); useAmmo(); recoil = recoilAmount;