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

Change getClientData to getPlayerData

Browse Source
This commit is contained in:
Vortrex
2020-12-25 02:48:00 -06:00
parent 5227ff06e3
commit a02229631c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/server/keybind.js
View File

@@ -190,14 +190,14 @@ function removeKeyBindCommand(command, params, client) {
function addPlayerKeyBind(client, keyId, tempCommand, tempParams) { function addPlayerKeyBind(client, keyId, tempCommand, tempParams) {
let keyBindData = new serverClasses.keyBindData(keyId, `${tempCommand} ${tempParams}`); let keyBindData = new serverClasses.keyBindData(keyId, `${tempCommand} ${tempParams}`);
getClientData(client).accountData.keyBinds.push(keyBindData); getPlayerData(client).accountData.keyBinds.push(keyBindData);
sendAccountKeyBindToClient(client, getPlayerKeyBindForKey(client, keyId)); sendAccountKeyBindToClient(client, getPlayerKeyBindForKey(client, keyId));
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function removePlayerKeyBind(client, keyId) { function removePlayerKeyBind(client, keyId) {
quickDatabaseQuery(`DELETE FROM acct_hotkey WHERE acct_hotkey_acct = ${getClientData(client).accountData.databaseId} AND acct_hotkey_key = ${keyId}`); quickDatabaseQuery(`DELETE FROM acct_hotkey WHERE acct_hotkey_acct = ${getPlayerData(client).accountData.databaseId} AND acct_hotkey_key = ${keyId}`);
for(let i in accountKeyBinds) { for(let i in accountKeyBinds) {
if(accountKeyBinds[i].key == keyId) { if(accountKeyBinds[i].key == keyId) {
accountKeyBinds.splice(i, 1); accountKeyBinds.splice(i, 1);
@@ -209,7 +209,7 @@ function removePlayerKeyBind(client, keyId) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function doesPlayerHaveKeyBindForCommand(client, command) { function doesPlayerHaveKeyBindForCommand(client, command) {
let accountKeyBinds = getClientData(client).accountData.keyBinds; let accountKeyBinds = getPlayerData(client).accountData.keyBinds;
for(let i in accountKeyBinds) { for(let i in accountKeyBinds) {
if(toLowerCase(accountKeyBinds[i].commandString.split(" ")[0]) == toLowerCase(command)) { if(toLowerCase(accountKeyBinds[i].commandString.split(" ")[0]) == toLowerCase(command)) {
return true; return true;
@@ -221,7 +221,7 @@ function doesPlayerHaveKeyBindForCommand(client, command) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getPlayerKeyBindForCommand(client, command) { function getPlayerKeyBindForCommand(client, command) {
let accountKeyBinds = getClientData(client).accountData.keyBinds; let accountKeyBinds = getPlayerData(client).accountData.keyBinds;
for(let i in accountKeyBinds) { for(let i in accountKeyBinds) {
if(toLowerCase(accountKeyBinds[i].commandString.split(" ")[0]) == toLowerCase(command)) { if(toLowerCase(accountKeyBinds[i].commandString.split(" ")[0]) == toLowerCase(command)) {
return accountKeyBinds[i]; return accountKeyBinds[i];
@@ -233,7 +233,7 @@ function getPlayerKeyBindForCommand(client, command) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function doesPlayerHaveKeyBindForKey(client, key) { function doesPlayerHaveKeyBindForKey(client, key) {
let accountKeyBinds = getClientData(client).accountData.keyBinds; let accountKeyBinds = getPlayerData(client).accountData.keyBinds;
for(let i in accountKeyBinds) { for(let i in accountKeyBinds) {
if(accountKeyBinds[i].key == key) { if(accountKeyBinds[i].key == key) {
return true; return true;
@@ -245,7 +245,7 @@ function doesPlayerHaveKeyBindForKey(client, key) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getPlayerKeyBindForKey(client, key) { function getPlayerKeyBindForKey(client, key) {
let accountKeyBinds = getClientData(client).accountData.keyBinds; let accountKeyBinds = getPlayerData(client).accountData.keyBinds;
for(let i in accountKeyBinds) { for(let i in accountKeyBinds) {
if(accountKeyBinds[i].key == key) { if(accountKeyBinds[i].key == key) {
return accountKeyBinds[i]; return accountKeyBinds[i];
@@ -277,8 +277,8 @@ addNetworkHandler("ag.keybind.trig", playerUsedKeyBind);
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function sendAccountKeyBindsToClient(client) { function sendAccountKeyBindsToClient(client) {
for(let i in getClientData(client).accountData.keyBinds) { for(let i in getPlayerData(client).accountData.keyBinds) {
sendAccountKeyBindToClient(client, getClientData(client).accountData.keyBinds[i].key, getClientData(client).accountData.keyBinds[i].keyState); sendAccountKeyBindToClient(client, getPlayerData(client).accountData.keyBinds[i].key, getPlayerData(client).accountData.keyBinds[i].keyState);
} }
} }

2
scripts/server/messaging.js
View File

@@ -180,7 +180,7 @@ function messageClientClanChat(client, clanChattingClient, messageText) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function messageClientAdminChat(client, adminChattingClient, messageText) { function messageClientAdminChat(client, adminChattingClient, messageText) {
messageClientNormal(client, `[ADMIN CHAT] [#AAAAAA]${getClientData(adminChattingClient).accountData.staffTitle} [#CCCCCC]${getClientData(adminChattingClient).accountData.name}: [#FFFFFF]${messageText}`, getColourByType("orange")); messageClientNormal(client, `[ADMIN CHAT] [#AAAAAA]${getPlayerData(adminChattingClient).accountData.staffTitle} [#CCCCCC]${getPlayerData(adminChattingClient).accountData.name}: [#FFFFFF]${messageText}`, getColourByType("orange"));
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------