Make sure that element is not attached already + GLUE_ALLOW_DETACHING_VEHICLES_AS_A_DRIVER

Author: sacr1ficez

[gameplay]/glue/config/ShVehicleAttachConfig.lua

@@ -53,10 +53,11 @@ GLUE_SHOW_ONE_TIME_HINT = true -- whether player should receive one-time (till r
 
 GLUE_ALLOW_ATTACH_TOGGLING = true -- should players be able to control attach lock on their vehicle (as a driver)
 GLUE_ALLOW_DETACHING_ELEMENTS = true -- should players be able to detach already attached elements (as a driver)
+GLUE_ALLOW_DETACHING_VEHICLES_AS_A_DRIVER = true -- should vehicle driver be able to detach vehicle which is attached to his own (this is default behavior for helicopters)
 
-GLUE_ATTACH_DETACH_KEY = "X" -- used to attach/detach yourself/vehicle
-GLUE_ATTACH_TOGGLE_KEY = "C" -- only relevant if GLUE_ALLOW_ATTACH_TOGGLING is set to true; specifies whether players can disable attaching to vehicle which are driver of
-GLUE_DETACH_ELEMENTS_KEY = "B" -- only relevant if GLUE_ALLOW_DETACHING_ELEMENTS is set to true; controls whether vehicle driver is able to detach elements currently attached to vehicle
+GLUE_ATTACH_DETACH_KEY = "X" -- used to attach/detach yourself/vehicle/nearby vehicle (for helicopters)
+GLUE_ATTACH_TOGGLE_KEY = "C" -- only relevant if GLUE_ALLOW_ATTACH_TOGGLING is set to true; key used for toggling attach lock
+GLUE_DETACH_ELEMENTS_KEY = "B" -- only relevant if GLUE_ALLOW_DETACHING_ELEMENTS is set to true; key used for detaching all elements attached to vehicle
 
 GLUE_ATTACH_DETACH_DELAY = 300 -- how often player can attach/detach yourself/vehicle
 GLUE_ATTACH_TOGGLE_DELAY = 300 -- only relevant if GLUE_ALLOW_ATTACH_TOGGLING is set to true; how often player can toggle vehicle attach lock

[gameplay]/glue/logic/CVehicleAttach.lua

@@ -13,13 +13,10 @@ local function handleGlueAttachAndDetach()
 		local playerVehicleToDetach = playerVehicle
 		local playerVehicleType = getVehicleType(playerVehicle)
 		local playerVehicleHelicopter = (playerVehicleType == "Helicopter")
+		local playerHelicopterAttachedVehicle = getAttachedVehicle(playerVehicle)
 
-		if (playerVehicleHelicopter) then
-			local playerHelicopterAttachedVehicle = getAttachedVehicle(playerVehicle)
-
-			if (playerHelicopterAttachedVehicle) then
-				playerVehicleToDetach = playerHelicopterAttachedVehicle
-			end
+		if (playerHelicopterAttachedVehicle) then
+			playerVehicleToDetach = playerHelicopterAttachedVehicle
 		end
 
 		if (playerVehicleToDetach) then

[gameplay]/glue/logic/ShVehicleAttach.lua

@@ -23,6 +23,12 @@ function canPlayerAttachElementToVehicle(playerElement, attachElement, attachToE
 		return false
 	end
 
+	local attachElementAlreadyAttached = isElementAttached(attachElement)
+
+	if (attachElementAlreadyAttached) then
+		return false
+	end
+
 	local attachToElementVehicleType = isElementType(attachToElement, "vehicle")
 
 	if (not attachToElementVehicleType) then
@@ -207,15 +213,17 @@ function canPlayerDetachElementFromVehicle(playerElement, detachElement)
 			return false
 		end
 
-		local vehicleAttachToType = getVehicleType(attachToElement)
-		local vehicleAttachToHelicopter = (vehicleAttachToType == "Helicopter")
+		if (not GLUE_ALLOW_DETACHING_VEHICLES_AS_A_DRIVER) then
+			local vehicleAttachToType = getVehicleType(attachToElement)
+			local vehicleAttachToHelicopter = (vehicleAttachToType == "Helicopter")
 
-		if (not vehicleAttachToHelicopter) then
-			local vehicleController = getVehicleController(detachElement)
-			local vehicleDetachToDriver = (playerElement == vehicleController)
+			if (not vehicleAttachToHelicopter) then
+				local vehicleController = getVehicleController(detachElement)
+				local vehicleDetachToDriver = (playerElement == vehicleController)
 
-			if (not vehicleDetachToDriver) then
-				return false
+				if (not vehicleDetachToDriver) then
+					return false
+				end
 			end
 		end
 	end