Skip to content

Commit 001b0d5

Browse files
committed
Remove PvP feature
1 parent 0afaf9b commit 001b0d5

File tree

3 files changed

+0
-17
lines changed

3 files changed

+0
-17
lines changed

client/main.lua

-15
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,6 @@ Citizen.CreateThread(function()
3030
end
3131
end)
3232

33-
Citizen.CreateThread(function()
34-
while true do
35-
Citizen.Wait(0)
36-
37-
if pvpEnabled then
38-
for i = 0,32 do
39-
if NetworkIsPlayerActive(i) then
40-
SetCanAttackFriendly(GetPlayerPed(i), true, true)
41-
NetworkSetFriendlyFireOption(true)
42-
end
43-
end
44-
end
45-
end
46-
end)
47-
4833
local myDecorators = {}
4934

5035
RegisterNetEvent("es:setPlayerDecorator")

server/metrics.lua

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ local MetricsAPIRequest = "http://127.0.0.1:8001/em/metrics?uuid=" .. _UUID
77

88
function postMetrics()
99
PerformHttpRequest(MetricsAPIRequest, function(err, rText, headers) end, "POST", "", {
10-
pvpEnabled = settings.defaultSettings['pvpEnabled'],
1110
startingCash = settings.defaultSettings['startingCash'],
1211
startingBank = settings.defaultSettings['startingBank'],
1312
enableRankDecorators = settings.defaultSettings['enableRankDecorators'],

server/util.lua

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Users = {}
77
commands = {}
88
settings = {}
99
settings.defaultSettings = {
10-
['pvpEnabled'] = GetConvar('es_pvpEnabled', 'false'),
1110
['permissionDenied'] = GetConvar('es_permissionDenied', 'false'),
1211
['startingCash'] = GetConvar('es_startingCash', '0'),
1312
['startingBank'] = GetConvar('es_startingBank', '0'),

0 commit comments

Comments
 (0)