From c473bf86e5510a811c94e9f2cfb4e3d197f67544 Mon Sep 17 00:00:00 2001
From: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date: Tue, 8 Oct 2024 22:12:14 +0200
Subject: [PATCH] 3409 master (#3410)

* Update script_version.hpp

* Update README.md

* Update fn_equipmentClassToCategories.sqf

* Update changelog.rst
---
 A3A/addons/core/Includes/script_version.hpp   |  2 +-
 .../fn_equipmentClassToCategories.sqf         |  4 ++--
 README.md                                     |  2 +-
 changelog.rst                                 | 19 +++++++++++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/A3A/addons/core/Includes/script_version.hpp b/A3A/addons/core/Includes/script_version.hpp
index e9f89a06a5..0ce99c7c7b 100644
--- a/A3A/addons/core/Includes/script_version.hpp
+++ b/A3A/addons/core/Includes/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 3
 #define MINOR 7
-#define PATCHLVL 0
+#define PATCHLVL 1
 #define BUILD 0
diff --git a/A3A/addons/core/functions/Ammunition/fn_equipmentClassToCategories.sqf b/A3A/addons/core/functions/Ammunition/fn_equipmentClassToCategories.sqf
index a827a34025..7240fa1b85 100644
--- a/A3A/addons/core/functions/Ammunition/fn_equipmentClassToCategories.sqf
+++ b/A3A/addons/core/functions/Ammunition/fn_equipmentClassToCategories.sqf
@@ -163,8 +163,8 @@ call {
         if (getNumber (_config >> "rhs_disposable") == 1 or _mainmag == "CBA_fakeLauncherMagazine") then {
             _categories pushBack "Disposable";
             if (getNumber (_config >> "scope") == 1) exitWith { _categories set [0, "UsedLaunchers"] };
-            if (_mainmag == "CBA_fakeLauncherMagazine" and !isNil "cba_disposable_normalLaunchers") then {
-                _mainmag = (cba_disposable_normalLaunchers getVariable _classname) # 1;     // format is [realLauncher, magazine]
+            if (_mainmag == "CBA_fakeLauncherMagazine" and !isNil "cba_disposable_normalLaunchers"and {typeName cba_disposable_normalLaunchers == "HASHMAP"}) then {
+                _mainmag = (cba_disposable_normalLaunchers get _classname) # 1;     // format is [realLauncher, magazine]
             };
         };
         if (_categories#0 == "UsedLaunchers") exitWith {};
diff --git a/README.md b/README.md
index 857b0674b5..b243558487 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 <p align="center">
     <a href="https://github.com/official-antistasi-community/A3-Antistasi/releases/latest">
-        <img src="https://img.shields.io/badge/Latest_Version-3.7.0-blue.svg?style=flat-square" alt="Antistasi Version">
+        <img src="https://img.shields.io/badge/Latest_Version-3.7.1-blue.svg?style=flat-square" alt="Antistasi Version">
     </a>
     <a href="https://github.com/official-antistasi-community/A3-Antistasi/issues">
         <img src="https://img.shields.io/github/issues/official-antistasi-community/A3-Antistasi?style=flat-square" alt="Issues">
diff --git a/changelog.rst b/changelog.rst
index a167646a7d..fa2ddddec4 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -3,6 +3,25 @@ Changelog
 ==========
 
 
+Version 3.7.1
+===============
+
+.. note::
+   8th October 2024
+
+.. admonition:: Bugfixes
+
+   * :issue:`3409` Fix CUP disposable missile launchers breaking init after CBA 3.18 update
+
+.. warning::
+
+   * Please note that this changelog may contain both spelling/grammatical errors and/or factual errors. Should any factual errors exist, we apologise but with the sheer number of changes made per version it can be easy to lose or mistake a change when writing up the changelog.
+
+|
+
+-----
+
+
 Version 3.7.0
 ===============