Merge branch 'feature/allow-edit-volume' of https://github.com/omar-o22/mtasa-resources into feature/allow-edit-volume

Author: omar-o22

[gameplay]/internetradio/logic/handle_radio/CHandleRadio.lua

@@ -230,7 +230,6 @@ function setPlayerSpeakerVolume(playerElement, volume)
 	end
 
 	setSoundVolume(speakerSound, volume)
-	
 	return true
 end
 

[gameplay]/internetradio/logic/handle_radio/SHandleRadio.lua

@@ -162,6 +162,9 @@ function onServerEditVolume(volume)
 	local speakerData = playerSpeakers[client]
 
 	if (not speakerData) then
+	local speakerData = playerSpeakers[client]
+
+	if (not speakerData or not speakerData.speakerBox) then
 		return false
 	end
 

[gameplay]/superman/CHandleSuperman.lua

@@ -85,6 +85,7 @@ function onClientResourceStartSuperman()
 	addEventHandler("onClientRender", root, onClientRenderSupermanProcessControls)
 	addEventHandler("onClientRender", root, onClientRenderSupermanProcessFlight)
 	addEventHandler("onClientPlayerDamage", localPlayer, onClientPlayerDamageSuperman)
+	addEventHandler("onClientPlayerWasted", localPlayer, onClientPlayerWastedSuperman)
 	addEventHandler("onClientPlayerVehicleEnter", localPlayer, onClientPlayerVehicleEnterSuperman)
 	addEventHandler("onClientElementStreamIn", root, onClientElementStreamInSuperman)
 	addEventHandler("onClientElementStreamOut", root, onClientElementStreamOutSuperman)
@@ -154,6 +155,17 @@ function onClientPlayerDamageSuperman()
 	cancelEvent()
 end
 
+function onClientPlayerWastedSuperman()
+	local playerFlying = isPlayerFlying(localPlayer)
+
+	if (not playerFlying) then
+		return false
+	end
+
+	setGravity(serverGravity)
+	restorePlayerFromSuperman(localPlayer)
+end
+
 function onClientElementStreamInSuperman()
 	local validElement = isElement(source)