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

Check if payphone & player valid for desync fix

Browse Source
This commit is contained in:
Vortrex
2023-03-07 20:59:23 -06:00
parent ea4cd87202
commit 0368ea3371
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/server/payphone.js
View File

@@ -691,12 +691,17 @@ function fixDesyncedPayPhones() {
for (let i in getServerData().payPhones) { for (let i in getServerData().payPhones) {
switch (getServerData().payPhones[i].state) { switch (getServerData().payPhones[i].state) {
case V_PAYPHONE_STATE_RINGING: case V_PAYPHONE_STATE_RINGING:
if (getPayPhoneData(getPayPhoneData(i).otherPayPhone).state != V_PAYPHONE_STATE_CALLING) { if (getPayPhoneData(i).otherPayPhone != -1) {
getPlayerData(getServerData().payPhones[i].usingPlayer).usingPayPhone = -1; if (getPayPhoneData(getPayPhoneData(i).otherPayPhone).state != V_PAYPHONE_STATE_CALLING) {
getPlayerData(getServerData().payPhones[i].usingPlayer).payPhoneCallStart = 0; if (getServerData().payPhones[i].usingPlayer != null) {
getPlayerData(getServerData().payPhones[i].usingPlayer).payPhoneInitiatedCall = false; getPlayerData(getServerData().payPhones[i].usingPlayer).usingPayPhone = -1;
getPlayerData(getServerData().payPhones[i].usingPlayer).payPhoneOtherPlayer = null; getPlayerData(getServerData().payPhones[i].usingPlayer).payPhoneCallStart = 0;
setPayPhoneState(i, V_PAYPHONE_STATE_IDLE); getPlayerData(getServerData().payPhones[i].usingPlayer).payPhoneInitiatedCall = false;
getPlayerData(getServerData().payPhones[i].usingPlayer).payPhoneOtherPlayer = null;
}
getPayPhoneData(i).otherPayPhone = -1;
setPayPhoneState(i, V_PAYPHONE_STATE_IDLE);
}
} }
break; break;
@@ -704,8 +709,6 @@ function fixDesyncedPayPhones() {
break; break;
} }
} }
sendPayPhoneStateToPlayer(null, -1, V_PAYPHONE_STATE_IDLE);
} }
// =========================================================================== // ===========================================================================
@@ -713,4 +716,6 @@ function fixDesyncedPayPhones() {
function setPayPhoneState(payPhoneIndex, state) { function setPayPhoneState(payPhoneIndex, state) {
getPayPhoneData(payPhoneIndex).state = state; getPayPhoneData(payPhoneIndex).state = state;
sendPayPhoneStateToPlayer(null, payPhoneIndex, state); sendPayPhoneStateToPlayer(null, payPhoneIndex, state);
} }
// ===========================================================================