Skip to content

Update admin_servermaps.lua #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from Jun 7, 2021
Merged

Update admin_servermaps.lua #326

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6c20c1
Update admin_servermaps.lua
May 29, 2021
e34b5fd
Update [admin]/admin/server/admin_servermaps.lua
May 30, 2021
c2e1bb6
Update [admin]/admin/server/admin_servermaps.lua
May 30, 2021
2496031
Update [admin]/admin/server/admin_servermaps.lua
May 30, 2021
e358456
Update [admin]/admin/server/admin_servermaps.lua
May 30, 2021
a0c1f83
Update admin_servermaps.lua
myusernamewo May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions [admin]/admin/server/admin_servermaps.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,31 @@

function getServerMaps (loadList)
if checkClient( true, source, 'getServerMaps' ) then return end
local tableOut
local tableOut = {}

local mapmanager = getResourceFromName("mapmanager")

if mapmanager and (getResourceState(mapmanager) ~= "running") then
mapmanager = nil
end

-- Check if 'mapmanager' resource exists
if ( not getResourceFromName("mapmanager") ) then
if ( not mapmanager ) then
-- 'mapmanager' resource doesn't exist, send fake data
triggerClientEvent(source ,"getMaps_c", source, { }, nil, nil )
return false;
end

if loadList then
tableOut = {}
-- local deletedMaps = {}
local gamemodes = {}
gamemodes = call(getResourceFromName("mapmanager"), "getGamemodes")
gamemodes = call(mapmanager, "getGamemodes")
for id,gamemode in ipairs (gamemodes) do
tableOut[id] = {}
tableOut[id].name = getResourceInfo(gamemode, "name") or getResourceName(gamemode)
tableOut[id].resname = getResourceName(gamemode)
tableOut[id].maps = {}
local maps = call(getResourceFromName("mapmanager"), "getMapsCompatibleWithGamemode" , gamemode)
local maps = call(mapmanager, "getMapsCompatibleWithGamemode" , gamemode)
for _,map in ipairs (maps) do
table.insert(tableOut[id]["maps"] ,{name = getResourceInfo(map, "name") or getResourceName(map), resname = getResourceName(map)})
end
Expand All @@ -38,7 +43,7 @@ function getServerMaps (loadList)
table.sort((tableOut), sortCompareFunction)
table.insert(tableOut, {name = "no gamemode", resname = "no gamemode", maps = {}})
local countGmodes = #tableOut
local maps = call(getResourceFromName("mapmanager"), "getMapsCompatibleWithGamemode")
local maps = call(mapmanager, "getMapsCompatibleWithGamemode")
for id,map in ipairs (maps) do
-- if fileOpen(":"..getResourceName(map).."/deleted") then
-- table.insert(deletedMaps ,{name = getResourceInfo(map, "name") or getResourceName(map), resname = getResourceName(map)})
Expand All @@ -52,8 +57,8 @@ function getServerMaps (loadList)
-- local countGmodes = countGmodes + 1
-- tableOut[countGmodes]["maps"] = deletedMaps
end
local map = call(getResourceFromName("mapmanager"), "getRunningGamemodeMap")
local gamemode = call(getResourceFromName("mapmanager"), "getRunningGamemode")
local map = call(mapmanager, "getRunningGamemodeMap")
local gamemode = call(mapmanager, "getRunningGamemode")
gamemode = gamemode and getResourceName(gamemode) or "N/A"
map = map and getResourceName(map) or "N/A"
triggerClientEvent(source ,"getMaps_c", source, tableOut, gamemode, map)
Expand All @@ -64,7 +69,13 @@ addEventHandler("getMaps_s", getRootElement(), getServerMaps)
function startGamemodeMap(gamemode, map)
if checkClient( true, source, 'startGamemodeMap' ) then return end

if ( not getResourceFromName("mapmanager") ) then
local mapmanager = getResourceFromName("mapmanager")

if mapmanager and (getResourceState(mapmanager) ~= "running") then
mapmanager = nil
end

if ( not mapmanager ) then
if ( source ) then
outputChatBox ( "Please start the mapmanager resource to use this action.", source, 255, 0, 0 );
end
Expand All @@ -73,15 +84,15 @@ function startGamemodeMap(gamemode, map)
end

if gamemode == "no gamemode" then
call(getResourceFromName("mapmanager"), "changeGamemodeMap", getResourceFromName(map))
call(mapmanager, "changeGamemodeMap", getResourceFromName(map))
else
if gamemode == map then
call(getResourceFromName("mapmanager"), "changeGamemode", getResourceFromName(gamemode))
call(mapmanager, "changeGamemode", getResourceFromName(gamemode))
else
if gamemode == getResourceName(call(getResourceFromName("mapmanager"), "getRunningGamemode")) then
call(getResourceFromName("mapmanager"), "changeGamemodeMap", getResourceFromName(map))
if gamemode == getResourceName(call(mapmanager, "getRunningGamemode")) then
call(mapmanager, "changeGamemodeMap", getResourceFromName(map))
else
call(getResourceFromName("mapmanager"), "changeGamemode", getResourceFromName(gamemode), getResourceFromName(map))
call(mapmanager, "changeGamemode", getResourceFromName(gamemode), getResourceFromName(map))
end
end
end
Expand Down