update

2026-08-29 17:28:53 +00:00 · 2020-04-24 20:30:26 +02:00
parent 01a7259288
commit 5de27e34aa
5 changed files with 129 additions and 131 deletions
@@ -6,17 +6,20 @@ Citizen.CreateThread(function()
    end
 end)

-Citizen.CreateThread(function()
-    while true do
-        Citizen.Wait(0)
-        if NetworkIsSessionStarted() then
-            Citizen.Wait(100)
-            TriggerServerEvent("kashactersS:SetupCharacters")
-            TriggerEvent("kashactersC:SetupCharacters")
-            return
-        end
-    end
-end)
+-- This Code Was changed to fix error With player spawner as default --
+-- Link to the post with the error fix --
+-- https://forum.fivem.net/t/release-esx-kashacters-multi-character/251613/316?u=xxfri3ndlyxx --
+--Citizen.CreateThread(function()
+--    while true do
+--        Citizen.Wait(0)
+--        if NetworkIsSessionStarted() then
+--            Citizen.Wait(100)
+--            TriggerServerEvent("kashactersS:SetupCharacters")
+--            TriggerEvent("kashactersC:SetupCharacters")
+--           return -- break the loop
+--        end
+--    end
+--end)

 local IsChoosing = true
 Citizen.CreateThread(function ()
@@ -56,48 +59,56 @@ AddEventHandler('kashactersC:SetupUI', function(Characters)
 end)

 RegisterNetEvent('kashactersC:SpawnCharacter')
-AddEventHandler('kashactersC:SpawnCharacter', function(spawn, isnew)
-
-    SetTimecycleModifier('default')
-
-    local pos = spawn
-
-    SetEntityCoords(GetPlayerPed(-1), pos.x, pos.y, pos.z)
-    DoScreenFadeIn(500)
-
-    Citizen.Wait(500)
-
-    cam2 = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", -1355.93,-1487.78,520.75, 300.00,0.00,0.00, 100.00, false, 0)
-    PointCamAtCoord(cam2, pos.x,pos.y,pos.z+200)
-    SetCamActiveWithInterp(cam2, cam, 900, true, true)
-
-    Citizen.Wait(900)
-
-    cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", pos.x,pos.y,pos.z+200, 300.00,0.00,0.00, 100.00, false, 0)
-    PointCamAtCoord(cam, pos.x,pos.y,pos.z+2)
-    SetCamActiveWithInterp(cam, cam2, 3700, true, true)
-
-    Citizen.Wait(3700)
-
-    PlaySoundFrontend(-1, "Zoom_Out", "DLC_HEIST_PLANNING_BOARD_SOUNDS", 1)
-    RenderScriptCams(false, true, 500, true, true)
-    PlaySoundFrontend(-1, "CAR_BIKE_WHOOSH", "MP_LOBBY_SOUNDS", 1)
-    FreezeEntityPosition(GetPlayerPed(-1), false)
-
-    Citizen.Wait(500)
-
-    SetCamActive(cam, false)
-    DestroyCam(cam, true)
-    IsChoosing = false
-    DisplayHud(true)
-    DisplayRadar(true)
-
-    TriggerEvent('esx:kashloaded')
-
+AddEventHandler('kashactersC:SpawnCharacter', function(isnew)
    if isnew == true then
-        TriggerEvent('esx_identity:showRegisterIdentity')
-     end
+		SetTimecycleModifier('default')
+		
+		local pos = { x = -1044.73, y = -2749.13, z = 21.3634 } -- DEFAULT SPAWN POSITION
+		RequestCollisionAtCoord(pos.x, pos.y, pos.z)
+		SetEntityCoords(GetPlayerPed(-1), pos.x, pos.y, pos.z)
+		DoScreenFadeIn(500)

+		Citizen.Wait(500)
+
+		cam2 = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", -1355.93,-1487.78,520.75, 300.00,0.00,0.00, 100.00, false, 0)
+		PointCamAtCoord(cam2, pos.x,pos.y,pos.z+200)
+		SetCamActiveWithInterp(cam2, cam, 900, true, true)
+
+		Citizen.Wait(900)	
+	    cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", pos.x,pos.y,pos.z+200, 300.00,0.00,0.00, 100.00, false, 0)
+		PointCamAtCoord(cam, pos.x,pos.y,pos.z+2)
+		SetCamActiveWithInterp(cam, cam2, 3700, true, true)
+
+		Citizen.Wait(3700)
+
+		PlaySoundFrontend(-1, "Zoom_Out", "DLC_HEIST_PLANNING_BOARD_SOUNDS", 1)
+		RenderScriptCams(false, true, 500, true, true)
+		PlaySoundFrontend(-1, "CAR_BIKE_WHOOSH", "MP_LOBBY_SOUNDS", 1)
+		FreezeEntityPosition(GetPlayerPed(-1), false)
+		Citizen.Wait(500)
+		SetPlayerInvincible(GetPlayerPed(-1), false);
+		SetEntityCollision(GetPlayerPed(-1), true, true)
+		SetCamActive(cam, false)
+		DestroyCam(cam, true)
+		IsChoosing = false
+
+		SetEntityVisible(GetPlayerPed(-1), true, false)
+
+		TriggerEvent('esx:kashloaded')
+        TriggerEvent('esx_identity:showRegisterIdentity')
+	else
+		SetTimecycleModifier('default')
+		DoScreenFadeIn(500)
+		Citizen.Wait(500)
+		RenderScriptCams(false, true, 500, true, true)
+		SetCamActive(cam, false)
+		DestroyCam(cam, true)
+		IsChoosing = false
+		DisplayHud(true)
+		DisplayRadar(true)
+		TriggerEvent('esx:kashloaded')
+		TriggerEvent("madrp-spawn")
+    end
 end)

 RegisterNetEvent('kashactersC:ReloadCharacters')
@@ -48,7 +48,7 @@ p {
 .btn-play {
    background: #43A047;
    color: #FFFFFF;
-    float:left;
+
    margin-right: 10px;
 }

@@ -59,7 +59,6 @@ p {
 .btn-delete {
    background: #930b0b;
    color: #FFFFFF;
-    float:left;
 }

 .btn-delete:hover {
@@ -24,7 +24,7 @@ $(".character-box").click(function () {
 });

 $("#play-char").click(function () {
-    $.post("http://esx_kashacter/CharacterChosen", JSON.stringify({
+    $.post("http://esx_kashacters/CharacterChosen", JSON.stringify({
        charid: $('.active-char').attr("data-charid"),
        ischar: $('.active-char').attr("data-ischar"),
    }));
@@ -32,7 +32,7 @@ $("#play-char").click(function () {
 });

 $("#deletechar").click(function () {
-    $.post("http://esx_kashacter/DeleteCharacter", JSON.stringify({
+    $.post("http://esx_kashacters/DeleteCharacter", JSON.stringify({
        charid: $('.active-char').attr("data-charid"),
    }));
    Kashacter.CloseUI();
@@ -47,7 +47,7 @@ $("#deletechar").click(function () {
            $.each(data.characters, function (index, char) {
                if (char.charid !== 0) {
                    var charid = char.identifier.charAt(4);
-                    $('[data-charid=' + charid + ']').html('<h3 class="character-fullname">'+ char.firstname +' '+ char.lastname +'</h3><div class="character-info"><p class="character-info-work"><strong>' + `${translate.job}: ` + '</strong><span>'+ char.job +' '+ char.job_grade +'</span></p><p class="character-info-money"><strong>' + `${translate.money}: ` + '</strong><span>'+ char.money +'</span></p><p class="character-info-bank"><strong>' + `${translate.bank}: ` + '</strong><span>'+ char.bank +'</span></p> <p class="character-info-dateofbirth"><strong>' + `${translate.dob}: ` + '</strong><span>'+ char.dateofbirth +'</span></p> <p class="character-info-gender"><strong>' + `${translate.gender}: ` + '</strong><span>'+ char.sex +'</span></p></div>').attr("data-ischar", "true");
+                    $('[data-charid=' + charid + ']').html('<h3 class="character-fullname">'+ char.firstname +' '+ char.lastname +'</h3><div class="character-info"><p class="character-info-work"><strong>Work: </strong><span>'+ char.job +' '+ char.job_grade +'</span></p><p class="character-info-money"><strong>Cash: </strong><span>'+ char.money +'</span></p><p class="character-info-bank"><strong>Bank: </strong><span>'+ char.bank +'</span></p> <p class="character-info-dateofbirth"><strong>Date of birth: </strong><span>'+ char.dateofbirth +'</span></p> <p class="character-info-gender"><strong>Gender: </strong><span>'+ char.sex +'</span></p></div>').attr("data-ischar", "true");
                }
            });
        }
@@ -57,7 +57,7 @@ $("#deletechar").click(function () {
        $('.main-container').css({"display":"none"});
        $(".character-box").removeClass('active-char');
        $("#delete").css({"display":"none"});
-        $(".character-box").html('<h3 class="character-fullname"><i class="fas fa-plus"></i></h3><div class="character-info"><p class="character-info-new">' + `${translate.new}` + '</p></div>').attr("data-ischar", "false");
+		$(".character-box").html('<h3 class="character-fullname"><i class="fas fa-plus"></i></h3><div class="character-info"><p class="character-info-new">Create new character</p></div>').attr("data-ischar", "false");
    };
    window.onload = function(e) {
        window.addEventListener('message', function(event) {
@@ -69,4 +69,4 @@ $("#deletechar").click(function () {
        })
    }

-})();
+})();
@@ -7,44 +7,58 @@
        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
        <!-- Bootstrap CSS -->
        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-        <script src="locales/en.js"></script>
        <!-- Google Fonts -->
        <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
    </head>
    <body style="background-color: rgba(0,0,0,0); font-family: 'Roboto', sans-serif !important;">
-        <div class="main-container">
+	<div class="main-container">
+        <div>
            <div class="character-container">
                <div class="character-box" data-ischar="false" data-charid="1">
-                    <h3 class="character-fullname"><i class="fas fa-plus"></i></h3>
+                    <h3 class="character-fullname">Empty Slot</h3>
                    <div class="character-info">
-                        <p class="character-info-new"></p>
+                        <p class="character-info-new">Create new character</p>
                    </div>
                </div>
                <div class="character-box" data-ischar="false" data-charid="2">
-                    <h3 class="character-fullname"><i class="fas fa-plus"></i></h3>
+                    <h3 class="character-fullname">Empty Slot</h3>
                    <div class="character-info">
                        <p class="character-info-new">Create new character</p>
                    </div>
                </div>
                <div class="character-box" data-ischar="false" data-charid="3">
-                    <h3 class="character-fullname"><i class="fas fa-plus"></i></h3>
+                    <h3 class="character-fullname">Empty Slot</h3>
                    <div class="character-info">
                        <p class="character-info-new">Create new character</p>
                    </div>
                </div>
                <div class="character-box" data-ischar="false" data-charid="4">
-                    <h3 class="character-fullname"><i class="fas fa-plus"></i></h3>
+                    <h3 class="character-fullname">Empty Slot</h3>
+                    <div class="character-info">
+                        <p class="character-info-new">Create new character</p>
+                    </div>
+                </div>
+                <div class="character-box" data-ischar="false" data-charid="5">
+                    <h3 class="character-fullname">Empty Slot</i></h3>
+                    <div class="character-info">
+                        <p class="character-info-new">Create new character</p>
+                    </div>
+                </div>
+                <div class="character-box" data-ischar="false" data-charid="6">
+                    <h3 class="character-fullname">Empty Slot</i></h3>
                    <div class="character-info">
                        <p class="character-info-new">Create new character</p>
                    </div>
                </div>
            </div>
-            <div class="character-buttons">
+        </div>
+		<br>
+		<center>
+			<div class="character-buttons" >
                <button class="btn btn-play" id="play-char">PLAY</button>
                <button class="btn btn-delete" id="delete" data-toggle="modal" data-target="#delete-char">DELETE</button>
            </div>
-        </div>
-
+		</center>
        <div id="delete-char" class="modal fade" role="dialog">
            <div class="modal-dialog">
                <div class="modal-content">
@@ -52,9 +66,9 @@
                        <button type="button" class="close" data-dismiss="modal">&times;</button>
                    </div>
                    <div class="modal-body">
-                        <h5 class="modalTitle">Are You Sure?</h5>
+                        <h5>Are You Sure?</h5>
                        <hr>
-                        <p class="modalText">By deleting your account we won't be able to recover it, all properties, cars etc. will be deleted</p>
+                        <p>By deleting your account we won't be able to recover it, all properties, cars etc. will be deleted</p>
                        <hr>
                        <div class="modal-footer">
                            <button id="deletechar" class="btn btn-delete" data-toggle="modal" data-dismiss="modal">DELETE</button>
@@ -67,15 +81,6 @@
        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
        <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
        <script src="js/app.js" type="text/javascript"></script>
+	</div>
    </body>
-</html>
-
-        <script>
-            $(document).ready(() => {
-                $(".character-info-new").html(translate.new)
-                $(".btn-play").html(translate.play);
-                $(".btn-delete").html(translate.delete);
-                $(".modalTitle").html(translate.modalTitle);
-                $(".modalText").html(translate.modalText);
-            });
-        </script>
+</html>
@@ -2,16 +2,24 @@
 -- Edit this table to all the database tables and columns
 -- where identifiers are used (such as users, owned_vehicles, owned_properties etc.)
 ---------------------------------------------------------------------------------------
+
 local IdentifierTables = {
    {table = "addon_account_data", column = "owner"},
    {table = "addon_inventory_items", column = "owner"},
-    {table = "billing", column = "identifier"},
    {table = "datastore_data", column = "owner"},
-    {table = "owned_vehicles", column = "owner"},
    {table = "owned_properties", column = "owner"},
+    {table = "owned_vehicles", column = "owner"},
+    {table = "phone_calls", column = "owner"},
+    {table = "phone_messages", column = "owner"},
+    {table = "private_vehicles", column = "owner"},
    {table = "rented_vehicles", column = "owner"},
+	{table = "user_licenses", column = "owner"},
+    {table = "billing", column = "identifier"},
+    {table = "crimerecord", column = "identifier"},
+    {table = "phone_users_contacts", column = "identifier"},
+    {table = "society_moneywash", column = "identifier"},
    {table = "users", column = "identifier"},
-    {table = "user_licenses", column = "owner"},
+	{table = "twitter_tweets", column = "realUser"}
 }

 RegisterServerEvent("kashactersS:SetupCharacters")
@@ -19,7 +27,7 @@ AddEventHandler('kashactersS:SetupCharacters', function()
    local src = source
    local LastCharId = GetLastCharacter(src)

-    SetIdentifierToChar(GetRockstarID(src), LastCharId)
+    SetIdentifierToChar(GetPlayerIdentifiers(src)[2], LastCharId)
    local Characters = GetPlayerCharacters(src)
    TriggerClientEvent('kashactersC:SetupUI', src, Characters)
 end)
@@ -27,63 +35,56 @@ end)
 RegisterServerEvent("kashactersS:CharacterChosen")
 AddEventHandler('kashactersS:CharacterChosen', function(charid, ischar)
    local src = source
-    local new = true
-    local spawn = {}
-
+	local isnew = true
    SetLastCharacter(src, tonumber(charid))
-    SetCharToIdentifier(GetRockstarID(src), tonumber(charid))
-
+    SetCharToIdentifier(GetPlayerIdentifiers(src)[2], tonumber(charid))
    if ischar == "true" then
-        new = false
-        spawn = GetSpawnPos(src)
+		isnew = false
    else
-	TriggerClientEvent('skinchanger:loadDefaultModel', src, true, cb)
-        spawn = { x = 195.55, y = -933.36, z = 29.90 } -- DEFAULT SPAWN POSITION
+		TriggerClientEvent('skinchanger:loadDefaultModel', src, true, cb)
    end
-
-    TriggerClientEvent("kashactersC:SpawnCharacter", src, spawn, new)
+    TriggerClientEvent("kashactersC:SpawnCharacter", src, isnew)
 end)

 RegisterServerEvent("kashactersS:DeleteCharacter")
 AddEventHandler('kashactersS:DeleteCharacter', function(charid)
    local src = source
-    DeleteCharacter(GetRockstarID(src), charid)
+    DeleteCharacter(GetPlayerIdentifiers(src)[2], charid)
    TriggerClientEvent("kashactersC:ReloadCharacters", src)
 end)

 function GetPlayerCharacters(source)
-  local Chars = MySQLAsyncExecute("SELECT * FROM `users` WHERE identifier LIKE '%"..GetIdentifierWithoutLicense(GetRockstarID(source)).."%'")
-
+  local identifier = GetIdentifierWithoutLicense(GetPlayerIdentifiers(source)[2])
+  local Chars = MySQLAsyncExecute("SELECT * FROM `users` WHERE identifier LIKE '%"..identifier.."%'")
  for i = 1, #Chars, 1 do
    charJob = MySQLAsyncExecute("SELECT * FROM `jobs` WHERE `name` = '"..Chars[i].job.."'")
    charJobgrade = MySQLAsyncExecute("SELECT * FROM `job_grades` WHERE `grade` = '"..Chars[i].job_grade.."' AND `job_name` = '"..Chars[i].job.."'")
-    local accounts = json.decode(Chars[i].accounts)
-    Chars[i].bank = accounts["bank"]
-    Chars[i].money = accounts["money"]
+	
+	local accounts = json.decode(Chars[i].accounts)
+	Chars[i].bank = accounts["bank"]
+	Chars[i].money = accounts["money"]
    Chars[i].job = charJob[1].label
-    if charJobgrade[1].label ~= "Unemployed" then
-      Chars[i].job_grade = charJobgrade[1].label
-    else
-      Chars[i].job_grade = ""
-    end
+	if charJob[1].label == "Unemployed" then
+		Chars[i].job_grade = ""
+	else
+		Chars[i].job_grade = charJobgrade[1].label		
+	end
  end
-
  return Chars
 end

 function GetLastCharacter(source)
-    local LastChar = MySQLAsyncExecute("SELECT `charid` FROM `user_lastcharacter` WHERE `steamid` = '"..GetRockstarID(source).."'")
-
+    local LastChar = MySQLAsyncExecute("SELECT `charid` FROM `user_lastcharacter` WHERE `license` = '"..GetPlayerIdentifiers(source)[2].."'")
    if LastChar[1] ~= nil and LastChar[1].charid ~= nil then
        return tonumber(LastChar[1].charid)
    else
-        MySQLAsyncExecute("INSERT INTO `user_lastcharacter` (`steamid`, `charid`) VALUES('"..GetRockstarID(source).."', 1)")
+        MySQLAsyncExecute("INSERT INTO `user_lastcharacter` (`license`, `charid`) VALUES('"..GetPlayerIdentifiers(source)[2].."', 1)")
        return 1
    end
 end

 function SetLastCharacter(source, charid)
-    MySQLAsyncExecute("UPDATE `user_lastcharacter` SET `charid` = '"..charid.."' WHERE `steamid` = '"..GetRockstarID(source).."'")
+    MySQLAsyncExecute("UPDATE `user_lastcharacter` SET `charid` = '"..charid.."' WHERE `license` = '"..GetPlayerIdentifiers(source)[2].."'")
 end

 function SetIdentifierToChar(identifier, charid)
@@ -104,26 +105,8 @@ function DeleteCharacter(identifier, charid)
    end
 end

-function GetSpawnPos(source)
-    local SpawnPos = MySQLAsyncExecute("SELECT `position` FROM `users` WHERE `identifier` = '"..GetIdentifierWithoutLicense(GetRockstarID(source)).."'")
-    return json.decode(SpawnPos[1].position)
-end
-
 function GetIdentifierWithoutLicense(Identifier)
-    return string.gsub(Identifier, "license:", "")
-end
-
-function GetRockstarID(playerId)
-    local identifier
-
-    for k,v in ipairs(GetPlayerIdentifiers(playerId)) do
-        if string.match(v, 'license:') then
-            identifier = v
-            break
-        end
-    end
-
-    return identifier
+    return string.gsub(Identifier, "license", "")
 end

 function MySQLAsyncExecute(query)