Merge remote-tracking branch 'origin/master'

2023-05-21 15:24:30 -04:00
parent c335722de5 25b26be87b
commit 4d200276d2
1 changed files with 1 additions and 1 deletions
--- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
@@ -28,7 +28,7 @@ public class ItemTurret extends Turret{

    /** Initializes accepted ammo map. Format: [item1, bullet1, item2, bullet2...] */
    public void ammo(Object... objects){
-        ammoTypes = ObjectMap.of(objects);
+        ammoTypes = OrderedMap.of(objects);
    }

    /** Limits bullet range to this turret's range value. */