mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-16 21:46:03 +01:00
Merge branch 'jimathy:main' into main
This commit is contained in:
@@ -638,6 +638,8 @@ function lookEnt(entity)
|
|||||||
debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'")
|
debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'")
|
||||||
Wait(1500)
|
Wait(1500)
|
||||||
end
|
end
|
||||||
|
-- Make players head face the coord for 5 seconds
|
||||||
|
TaskLookAtCoord(ped, entity.x, entity.y, entity.z, 5000, 1, 1)
|
||||||
else
|
else
|
||||||
if DoesEntityExist(entity) then
|
if DoesEntityExist(entity) then
|
||||||
local entCoords = GetEntityCoords(entity)
|
local entCoords = GetEntityCoords(entity)
|
||||||
@@ -646,6 +648,9 @@ function lookEnt(entity)
|
|||||||
debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'")
|
debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'")
|
||||||
Wait(1500)
|
Wait(1500)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Make players head face the coord for 5 seconds
|
||||||
|
TaskLookAtEntity(ped, entity, 5000, 1, 1)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -263,4 +263,14 @@ function fundSociety(society, amount)
|
|||||||
end
|
end
|
||||||
|
|
||||||
print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
|
print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
|
||||||
|
end
|
||||||
|
|
||||||
|
if isServer() then
|
||||||
|
createCallback(getScript()..":server:getAccount", function(source, society)
|
||||||
|
if society then
|
||||||
|
local getMoney = getSocietyAccount(society)
|
||||||
|
return getMoney
|
||||||
|
end
|
||||||
|
return 0
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
@@ -77,6 +77,7 @@ end
|
|||||||
-- [[ Server.Cfg Convar Check ]]--
|
-- [[ Server.Cfg Convar Check ]]--
|
||||||
-- Check server convars for hard set defaults, otherwise it uses per script configurations
|
-- Check server convars for hard set defaults, otherwise it uses per script configurations
|
||||||
if Config and Config.System then
|
if Config and Config.System then
|
||||||
|
debugMode = Config.System.Debug
|
||||||
if Config.System.Debug then
|
if Config.System.Debug then
|
||||||
if GetConvar("jim_DisableDebug", "false") == "true" then
|
if GetConvar("jim_DisableDebug", "false") == "true" then
|
||||||
debugMode = false
|
debugMode = false
|
||||||
@@ -84,10 +85,7 @@ if Config and Config.System then
|
|||||||
if GetConvar("jim_DisableEventDebug", "false") == "true" then
|
if GetConvar("jim_DisableEventDebug", "false") == "true" then
|
||||||
Config.System.EventDebug = false
|
Config.System.EventDebug = false
|
||||||
end
|
end
|
||||||
else
|
|
||||||
debugMode = Config.System.Debug
|
|
||||||
end
|
end
|
||||||
|
|
||||||
Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
|
Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
|
||||||
Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
|
Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
|
||||||
Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")
|
Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")
|
||||||
|
|||||||
Reference in New Issue
Block a user