Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2023-05-21 15:24:30 -04:00

View File

@@ -28,7 +28,7 @@ public class ItemTurret extends Turret{
/** Initializes accepted ammo map. Format: [item1, bullet1, item2, bullet2...] */ /** Initializes accepted ammo map. Format: [item1, bullet1, item2, bullet2...] */
public void ammo(Object... objects){ public void ammo(Object... objects){
ammoTypes = ObjectMap.of(objects); ammoTypes = OrderedMap.of(objects);
} }
/** Limits bullet range to this turret's range value. */ /** Limits bullet range to this turret's range value. */