Merge branch 'develop' into patch-1

Author: Zorono

amx/client/util.lua

@@ -146,15 +146,6 @@ function getElemID(elem)
 	return elem and isElement(elem) and getElementData(elem, 'amx.id')
 end
 
-function atNextFrame(callback, ...)
-	local args = { ... }
-	local function fn()
-		callback(unpack(args))
-		removeEventHandler('onClientRender', root, fn)
-	end
-	addEventHandler('onClientRender', root, fn)
-end
-
 function table.find(t, ...)
 	local args = { ... }
 	if #args == 0 then

amx/server/events.lua

@@ -565,6 +565,10 @@ addEventHandler('onResourceStart', resourceRoot,
 	Now it's also used for updating players drunk level (decrease it over time)
 ]]
 function checkAndUpdatePlayers()
+	if not getRunningGameMode() then
+		return
+	end
+
 	for i, data in pairs(g_Players) do
 		local state = getPlayerState(data.elem)