logan/lsft
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: logan:205bdc02722ad7c8da5b2ac255b8f822d03b99da
Branches Tags
logan:master
..
compare: logan:7977f0129af857ecb972d4fb4115c3763afb14ac
Branches Tags
logan:master

No commits in common. "205bdc02722ad7c8da5b2ac255b8f822d03b99da" and "7977f0129af857ecb972d4fb4115c3763afb14ac" have entirely different histories.
205bdc0272 ... 7977f0129a

2 changed files with 11 additions and 19 deletions
Show stats Expand all files Collapse all files

26
modules/server/sv_darkrp.txt
View file

@ -37,24 +37,18 @@ do
if darkrp.canMakeMoneyRequest(target) then if darkrp.canMakeMoneyRequest(target) then
local money = owner():getMoney() local money = owner():getMoney()
local requestStr = "" target:requestMoney((#args[3] > 0 and args[3] or ""), amount,
if #args >= 3 then function() --Success
for i = 3, #args do if owner():getMoney() + amount >= money then
requestStr = requestStr.." "..args[i] core:log(log.INFO, "Successfully received "..darkrp.formatMoney(amount).." from "..target:getName().."!")
else
-- This probably won't happen here
core:log(log.ERROR, "An unknown error occured! Transaction status is unknown.")
end end
end,
function() --Failure
core:log(log.ERROR, "Money request to "..target:getName().." failed!")
end end
target:requestMoney(requestStr, amount,
function() --Success
if owner():getMoney() + amount >= money then
core:log(log.INFO, "Successfully received "..darkrp.formatMoney(amount).." from "..target:getName().."!")
else
-- This probably won't happen here
core:log(log.ERROR, "An unknown error occured! Transaction status is unknown.")
end
end,
function() --Failure
core:log(log.ERROR, "Money request to "..target:getName().." failed!")
end
) )
core:log(log.INFO, "Requested "..darkrp.formatMoney(amount).." from "..target:getName()..".") core:log(log.INFO, "Requested "..darkrp.formatMoney(amount).." from "..target:getName()..".")
else else

4
sv_lsft.txt
View file

@ -349,9 +349,7 @@ end
-- Get's a player's entity by searching for it via an inputted string -- Get's a player's entity by searching for it via an inputted string
function core:get_entity(ply) function core:get_entity(ply)
if ply == nil then if type(ply) == "Player" then
return nil
elseif type(ply) == "Player" then
return ply return ply
elseif ply == "^" then elseif ply == "^" then
return owner() return owner()