hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset client data stuff on disconnect

Browse Source
This commit is contained in:
Vortrex
2020-12-27 21:27:09 -06:00
parent 09574ee3e4
commit ad89cbcd46
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/server/event.js
View File

@@ -36,11 +36,13 @@ addEventHandler("OnPlayerJoined", function(event, client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
addEventHandler("OnPlayerQuit", function(event, client, quitReasonId) { addEventHandler("OnPlayerQuit", function(event, client, quitReasonId) {
console.log(`[Asshat.Event] ${getClientDisplayForConsole(client)} disconnected (${gameData.quitReasons[quitReasonId]}[${quitReasonId}])`); console.log(`[Asshat.Event] ${getClientDisplayForConsole(client)} disconnected (${disconnectReasons[quitReasonId]}[${quitReasonId}])`);
savePlayerToDatabase(client); savePlayerToDatabase(client);
resetClientStuff(client);
getServerData().clients[client.index] = null; getServerData().clients[client.index] = null;
message(`👋 ${client.name} has left the server (${gameData.quitReasons[quitReasonId]})`, getColourByName("softYellow")); message(`👋 ${client.name} has left the server (${disconnectReasons[quitReasonId]})`, getColourByName("softYellow"));
}); });
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -150,7 +152,10 @@ addEventHandler("OnPedEnterVehicle", function(event, ped, vehicle, seat) {
async function playerEnteredVehicle(client) { async function playerEnteredVehicle(client) {
await waitUntil(() => client.player.vehicle != null); await waitUntil(() => client.player.vehicle != null);
let vehicle = client.player.vehicle; let vehicle = client.player.vehicle;
console.log(vehicle);
console.log(`[Asshat.Event] ${getClientDisplayForConsole(client)} entered a ${getVehicleName(vehicle)} (ID: ${vehicle.getData("ag.dataSlot")}, Database ID: ${getVehicleData(vehicle).databaseId})`);
getPlayerData(client).lastVehicle = vehicle;
if(getPlayerVehicleSeat(client) == AG_VEHSEAT_DRIVER) { if(getPlayerVehicleSeat(client) == AG_VEHSEAT_DRIVER) {
vehicle.engine = getVehicleData(vehicle).engine; vehicle.engine = getVehicleData(vehicle).engine;
@@ -187,13 +192,31 @@ async function playerEnteredVehicle(client) {
} }
} }
} }
if(isPlayerWorking(client)) {
if(isPlayerOnJobRoute(client)) {
if(vehicle == getPlayerJobRouteVehicle(client)) {
stopReturnToJobVehicleCountdown(client);
}
}
}
} }
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function playerExitedVehicle(client, vehicle) { function playerExitedVehicle(client) {
//let vehicle = getElementFromId(vehicleId); let vehicle = getPlayerData(client).lastVehicle;
console.log(`[Asshat.Event] ${getClientDisplayForConsole(client)} exited a ${getVehicleName(vehicle)} (ID: ${vehicle.getData("ag.dataSlot")}, Database ID: ${getVehicleData(vehicle).databaseId})`);
if(isPlayerWorking(client)) {
if(isPlayerOnJobRoute(client)) {
if(vehicle == getPlayerJobRouteVehicle(client)) {
startReturnToJobVehicleCountdown(client);
}
}
}
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -221,3 +244,5 @@ function processPlayerDeath(client) {
}, 2000); }, 2000);
}, 1000); }, 1000);
} }
// ---------------------------------------------------------------------------