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

Send job index, not sacct job id

Browse Source
This commit is contained in:
Vortrex
2021-01-13 11:01:24 -06:00
parent 0026cd1a4d
commit 7f3b40c82e
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/server/client.js
View File

@@ -60,6 +60,8 @@ function addAllNetworkHandlers() {
// Item // Item
addNetworkHandler("ag.itemActionDelayComplete", playerItemActionDelayComplete); addNetworkHandler("ag.itemActionDelayComplete", playerItemActionDelayComplete);
addNetworkHandler("ag.weaponDamage", playerDamagedByPlayer);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -138,7 +140,7 @@ function clearPlayerOwnedPeds(client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function updatePlayerJobType(client) { function updatePlayerJobType(client) {
triggerNetworkEvent("ag.jobType", client, getPlayerCurrentSubAccount(client).job); triggerNetworkEvent("ag.jobType", client, getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(client).job));
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -457,7 +459,27 @@ function showPlayerItemPutDelay(client, itemSlot) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function showPlayerItemSwitchDelay(client, itemSlot) { function showPlayerItemSwitchDelay(client, itemSlot) {
triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).switchDelay); if(itemSlot != -1) {
if(getPlayerData(client).hotBarItems[itemSlot] != -1) {
triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).switchDelay);
} else {
playerSwitchItem(client, itemSlot);
}
} else {
playerSwitchItem(client, itemSlot);
}
}
// ---------------------------------------------------------------------------
function sendPlayerDrunkEffect(client, amount, duration) {
triggerNetworkEvent("ag.drunkEffect", client, amount, duration);
}
// ---------------------------------------------------------------------------
function sendPlayerClearPedState(client) {
triggerNetworkEvent("ag.clearPedState", client);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------