Merge pull request #2027 from acemod/joinGroupTeamManagement

EnableTeamManagement setting for joinGroup
acemod · Aug 8, 2015 · 451c88c · 451c88c
2 parents 7c7fb35 + 0bd1e1a
commit 451c88c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
@@ -91,7 +91,7 @@ class CfgVehicles {
 
                 class ACE_JoinGroup {
                     displayName = CSTRING(JoinGroup);
-                    condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinGroup));
+                    condition = QUOTE(GVAR(EnableTeamManagement) && {[ARR_2(_player,_target)] call DFUNC(canJoinGroup)});
                     statement = QUOTE([_player] joinSilent group _target);
                     showDisabled = 0;
                     priority = 2.6;