From 9572cff9dbc9ed584e1cb646dad4eee3e667b690 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 23 Feb 2019 10:49:23 -0600 Subject: [PATCH 1/2] Fix jam base class --- addons/jam/CfgWeapons.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp index 67a987284..5c992b835 100644 --- a/addons/jam/CfgWeapons.hpp +++ b/addons/jam/CfgWeapons.hpp @@ -3,6 +3,7 @@ class CfgWeapons { class Rifle_Base_F; class Rifle_Long_Base_F; class Launcher_Base_F; + class Rifle_Short_Base_F; class mk20_base_F: Rifle_Base_F { magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"}; From bc5bb825a845d48d1fd4ce603abda1d651999d9a Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 23 Feb 2019 10:49:46 -0600 Subject: [PATCH 2/2] Versioning - allow caching --- addons/versioning/CfgEventHandlers.hpp | 2 +- addons/versioning/XEH_postInitClient.sqf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/versioning/CfgEventHandlers.hpp b/addons/versioning/CfgEventHandlers.hpp index 34f8263d7..e639e9848 100644 --- a/addons/versioning/CfgEventHandlers.hpp +++ b/addons/versioning/CfgEventHandlers.hpp @@ -14,6 +14,6 @@ class Extended_PostInit_EventHandlers { class ADDON { init = QUOTE(call COMPILE_FILE(XEH_postInit)); serverInit = QUOTE(call COMPILE_FILE(XEH_postInitServer)); - clientInit = QUOTE(if !(isServer) then {call COMPILE_FILE(XEH_postInitClient)}); + clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient)); }; }; diff --git a/addons/versioning/XEH_postInitClient.sqf b/addons/versioning/XEH_postInitClient.sqf index 9ea5308d8..9435fdb77 100644 --- a/addons/versioning/XEH_postInitClient.sqf +++ b/addons/versioning/XEH_postInitClient.sqf @@ -1,5 +1,7 @@ #include "script_component.hpp" +if (isServer) exitWith {}; + SLX_XEH_STR spawn { waitUntil {!(isNil QGVAR(versions_serv))}; if (!SLX_XEH_DisableLogging) then {