From 7d2488e40cf22da0b3ff74b0c51eedf531c81d3c Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Thu, 29 Apr 2021 19:53:32 +0100
Subject: [PATCH] config

---
 client/main.lua | 8 ++++----
 config.lua      | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/main.lua b/client/main.lua
index c8342360..11f0b9cf 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -5,7 +5,6 @@ Citizen.CreateThread(function()
 		Citizen.Wait(0)
 
 		if NetworkIsPlayerActive(PlayerId()) then
-			if not Config.UseMulticharacter end
 			TriggerServerEvent('esx:onPlayerJoined')
 			break
 		end
@@ -45,9 +44,10 @@ AddEventHandler('esx:playerLoaded', function(playerData)
 	FreezeEntityPosition(PlayerPedId(), true)
 
 	-- enable PVP
-	SetCanAttackFriendly(PlayerPedId(), true, false)
-	NetworkSetFriendlyFireOption(true)
-
+	if Config.EnablePVP then
+		SetCanAttackFriendly(PlayerPedId(), true, false)
+		NetworkSetFriendlyFireOption(true)
+  end
 	-- disable wanted level
 if not Config.EnableWantedLevel then
 	ClearPlayerWantedLevel(PlayerId())
diff --git a/config.lua b/config.lua
index 57824c77..034a5f82 100644
--- a/config.lua
+++ b/config.lua
@@ -17,6 +17,7 @@ Config.EnableDebug            = false -- Use Debug options?
 Config.EnableDefaultInventory = true -- Display the default Inventory ( F2 )
 Config.EnableWantedLevel    	= false -- Use Normal GTA wanted Level?
 Config.DisableSuperadmin      = true -- Disable the use of superadmin
+Config.EnablePVP              = true -- Allow Player to player combat
 Config.UseMulticharacter      = false -- WIP, ADDS multicharacter features
 Config.UseKashacters          = true