Merge pull request #1078 from CBATeam/rc2Cleanup

Fix missing base class in JAM and fix versioning caching
CBATeam · Feb 23, 2019 · 58b9440 · 58b9440
2 parents f9b748e + bc5bb82
commit 58b9440
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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"};

diff --git 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
@@ -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 {