diff --git a/[admin]/admin/client/admin_client.lua b/[admin]/admin/client/admin_client.lua index 0b4af8bc5..92e14c377 100644 --- a/[admin]/admin/client/admin_client.lua +++ b/[admin]/admin/client/admin_client.lua @@ -58,7 +58,6 @@ function aAdminResourceStart () end aLoadSettings () triggerServerEvent ( "aPermissions", localPlayer ) - setTimer( function() triggerServerEvent ( "aPlayerVersion", localPlayer, getVersion() ) end, 2000, 1 ) guiSetInputMode ( "no_binds_when_editing" ) end @@ -143,52 +142,6 @@ end addEventHandler ( "onClientResourceStart", resourceRoot, aAdminResourceStart ) addEventHandler ( "onClientResourceStop", resourceRoot, aAdminResourceStop ) - --- --- Upgrade check message for 1.0 to 1.0.2 --- -addEvent ( "aClientShowUpgradeMessage", true ) -addEventHandler ( "aClientShowUpgradeMessage", root, - function() - local xml = xmlLoadFile("upgrade_cookie.xml") - if not xml then - xml = xmlCreateFile("upgrade_cookie.xml", "settings") - end - if not xml then return end - - local node = xmlFindChild(xml, "upgradeMessage", 0) - if not node then - node = xmlCreateChild(xml, "upgradeMessage") - end - local timeNow = getRealTimeSeconds() - local bShowConsoleText = true - local bShowMessageBox = true - - if bShowConsoleText then - local lastTime = xmlNodeGetAttribute(node, "lastConsoleTextTime") - local age = timeNow - ( tonumber(lastTime) or 0 ) - if age > 60*60 then - xmlNodeSetAttribute(node, "lastConsoleTextTime", tostring( timeNow )) - xmlSaveFile(xml) - outputConsole( "A new version of MTA:SA is available! - Please download from www.multitheftauto.com" ) - end - end - - if bShowMessageBox then - local lastTime = xmlNodeGetAttribute(node, "lastMessageBoxTime") - local age = timeNow - ( tonumber(lastTime) or 0 ) - if age > 60*60*24 then - xmlNodeSetAttribute(node, "lastMessageBoxTime", tostring( timeNow )) - xmlSaveFile(xml) - aMessageBox( "A new version of MTA:SA is available!", "Please download from www.multitheftauto.com" ) - setTimer ( aMessageBoxClose, 15000, 1, true ) - end - end - xmlUnloadFile (xml) - end -) - - function getRealTimeSeconds() return realTimeToSeconds( getRealTime() ) end diff --git a/[admin]/admin/server/admin_server.lua b/[admin]/admin/server/admin_server.lua index 9be838dc5..11aad48a4 100644 --- a/[admin]/admin/server/admin_server.lua +++ b/[admin]/admin/server/admin_server.lua @@ -460,6 +460,13 @@ function aPlayerInitialize(player) bindKey(player, "p", "down", "admin") aPlayers[player] = {} aPlayers[player]["money"] = getPlayerMoney(player) + + local strVersion = getPlayerVersion(player) + -- Format it all prettyful + local _,_,ver,type,build = string.find ( strVersion, "(.*)-([0-9])%.(.*)" ) + + aPlayers[player]["version"] = ver .. ( type < '9' and " pre " or " " ) .. "(" .. type .. "." .. build .. ")" + updatePlayerCountry(player) chatHistory[player] = {} end @@ -469,43 +476,6 @@ addEventHandler ( "onPlayerQuit", root, function () chatHistory[source] = nil end ) -addEvent ( "aPlayerVersion", true ) -addEventHandler ( "aPlayerVersion", root, function ( version ) - if checkClient( false, source, 'aPlayerVersion' ) then return end - local bIsPre = false - -- If not Release, mark as 'pre' - if version.type:lower() ~= "release" then - bIsPre = true - else - -- Extract rc version if there - local _,_,rc = string.find( version.tag or "", "(%d)$" ) - rc = tonumber(rc) or 0 - -- If release, but before final rc, mark as 'pre' - if version.mta == "1.0.2" and rc > 0 and rc < 13 then - bIsPre = true - elseif version.mta == "1.0.3" and rc < 9 then - bIsPre = true - end - -- If version does not have a built in version check, maybe show a message box advising an upgrade - if version.number < 259 or ( version.mta == "1.0.3" and rc < 3 ) then - triggerClientEvent ( source, "aClientShowUpgradeMessage", source ) - end - end - - -- Try to get new player version - local playerVersion - if getPlayerVersion then - playerVersion = getPlayerVersion(client) - else - playerVersion = version.mta .. "-" .. ( bIsPre and "7" or "9" ) .. ".00000.0" - end - - -- Format it all prettyful - local _,_,ver,type,build = string.find ( playerVersion, "(.*)-([0-9])%.(.*)" ) - if aPlayers[source] then - aPlayers[source]["version"] = ver .. ( type < '9' and " pre " or " " ) .. "(" .. type .. "." .. build .. ")" - end -end ) function aPlayerSerialCheck ( player, result ) if ( result == 0 ) then kickPlayer ( player, "Invalid serial" ) end @@ -670,7 +640,7 @@ local aAdminRights = { ["sync"] = "command.aclmanager", ["aclcreate"] = "command.aclcreate", - ["acldestroy"] = "command.acldetroy", + ["acldestroy"] = "command.acldestroy", ["acladd"] = "command.acladd", ["aclremove"] = "command.aclremove", }