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

Move death process to event.js

Browse Source
This commit is contained in:
Vortrex
2020-12-25 02:46:43 -06:00
parent ba497ca3e8
commit 5f4ea42728
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
scripts/server/event.js
View File

@@ -38,11 +38,11 @@ addEventHandler("OnPlayerJoined", function(event, client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
addEventHandler("OnPlayerQuit", function(event, client, quitReasonId) { addEventHandler("OnPlayerQuit", function(event, client, quitReasonId) {
//console.log(`[Asshat.Event] Client disconnected (Name: ${client.name}, Reason: ${gameData.quitReasons[quitReasonId]})`); console.log(`[Asshat.Event] ${getClientDisplayForConsole(client)} disconnected (${gameData.quitReasons[quitReasonId]}[${quitReasonId}])`);
saveClientToDatabase(client); savePlayerToDatabase(client);
getServerData().clients[client.index] = null; getServerData().clients[client.index] = null;
//message(`${client.name} has left the server (${gameData.quitReasons[quitReasonId]})`); message(`${client.name} has left the server (${gameData.quitReasons[quitReasonId]})`);
}); });
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -59,12 +59,12 @@ addEventHandler("OnPedSpawn", function(event, ped) {
addEventHandler("onPlayerChat", function(event, client, messageText) { addEventHandler("onPlayerChat", function(event, client, messageText) {
event.preventDefault(); event.preventDefault();
if(!getClientData(client).loggedIn) { if(!getPlayerData(client).loggedIn) {
messageClientError(client, "You need to login before you can chat!"); messageClientError(client, "You need to login before you can chat!");
return false; return false;
} }
message(`${getClientSubAccountName(client)}: [#FFFFFF]${messageText}`, getClientChatColour(client)); message(`${getClientSubAccountName(client)}: [#FFFFFF]${messageText}`, getPlayerColour(client));
}); });
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -162,8 +162,30 @@ function playerEnteredVehicle(client, vehicleId) {
function playerExitedVehicle(client, vehicle) { function playerExitedVehicle(client, vehicle) {
//let vehicle = getElementFromId(vehicleId); //let vehicle = getElementFromId(vehicleId);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function processPlayerDeath(client) {
removeEntityData(client.player, "ag.spawned", true);
let closestHospital = getClosestHospital(getPlayerPosition(client));
triggerNetworkEvent("ag.control", client, false);
setTimeout(function() {
triggerNetworkEvent("ag.fadeCamera", client, false, 1.0);
setTimeout(function() {
client.despawnPlayer();
if(getClientCurrentSubAccount(client).inJail) {
let closestJail = getClosestJail(getPlayerPosition(client));
spawnPlayer(client, closestJail.position, closestJail.heading, getClientCurrentSubAccount(client).skin);
} else {
spawnPlayer(client, closestHospital.position, closestHospital.heading, getClientCurrentSubAccount(client).skin);
}
setTimeout(function() {
setEntityData(client.player, "ag.spawned", true, true);
triggerNetworkEvent("ag.fadeCamera", client, true, 1.0);
triggerNetworkEvent("ag.control", client, true);
}, 1000);
}, 2000);
}, 1000);
}