This commit is contained in:
Vortrex
2022-03-08 01:10:49 -06:00
parent 9be4049c0a
commit 9c0e660c3e
3 changed files with 17 additions and 14 deletions

View File

@@ -599,7 +599,6 @@ function loginSuccess(client) {
getPlayerData(client).accountData.ipAddress = client.ip; getPlayerData(client).accountData.ipAddress = client.ip;
//sendRemovedWorldObjectsToPlayer(client);
sendPlayerChatScrollLines(client, getPlayerData(client).accountData.chatScrollLines); sendPlayerChatScrollLines(client, getPlayerData(client).accountData.chatScrollLines);
messagePlayerNormal(null, `👋 ${getPlayerName(client)} has joined the server`, getColourByName("softYellow")); messagePlayerNormal(null, `👋 ${getPlayerName(client)} has joined the server`, getColourByName("softYellow"));

View File

@@ -62,11 +62,11 @@ class ServerData {
this.antiCheat = { this.antiCheat = {
enabled: false, enabled: false,
checkGameScripts: false, //checkGameScripts: false,
gameScriptWhiteListEnabled: false, //gameScriptWhiteListEnabled: false,
gameScriptBlackListEnabled: false, //gameScriptBlackListEnabled: false,
gameScriptWhiteList: [], //gameScriptWhiteList: [],
gameScriptBlackList: [], //gameScriptBlackList: [],
}; };
this.discordBotToken = ""; this.discordBotToken = "";
@@ -126,11 +126,11 @@ class ServerData {
this.antiCheat = { this.antiCheat = {
enabled: hasBitFlag(this.settings, getServerSettingsFlagValue("Anticheat")), enabled: hasBitFlag(this.settings, getServerSettingsFlagValue("Anticheat")),
checkGameScripts: hasBitFlag(this.settings, getServerSettingsFlagValue("CheckGameScripts")), //checkGameScripts: hasBitFlag(this.settings, getServerSettingsFlagValue("CheckGameScripts")),
gameScriptBlackListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptBlackList")), //gameScriptBlackListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptBlackList")),
gameScriptWhiteListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptWhiteList")), //gameScriptWhiteListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptWhiteList")),
gameScriptWhiteList: [], //gameScriptWhiteList: [],
gameScriptBlackList: [], //gameScriptBlackList: [],
}; };
this.discordBotToken = intToBool(dbAssoc["svr_discord_bot_token"]); this.discordBotToken = intToBool(dbAssoc["svr_discord_bot_token"]);
@@ -263,6 +263,8 @@ class ClientData {
this.locale = 0; this.locale = 0;
this.enteringVehicle = null; this.enteringVehicle = null;
this.pedId = -1;
} }
}; };
@@ -672,7 +674,7 @@ class HouseData {
this.itemCache = []; this.itemCache = [];
this.locations = []; this.locations = [];
this.gameScripts = []; //this.gameScripts = [];
this.entrancePosition = false; this.entrancePosition = false;
this.entranceRotation = 0.0; this.entranceRotation = 0.0;

View File

@@ -2541,7 +2541,7 @@ let gameData = {
[594, "BeerCan"], [594, "BeerCan"],
[592, "BottleYellow"], [592, "BottleYellow"],
[500, "ArmourVest"], [500, "ArmourVest"],
[510, "PizzzBox"], [510, "PizzaBox"],
[597, "SodaBottle"], [597, "SodaBottle"],
[502, "GenericPackage2"] [502, "GenericPackage2"]
], ],
@@ -2603,7 +2603,9 @@ let gameData = {
[2601, "CanSoda"], [2601, "CanSoda"],
], ],
[], // GTA UG [], // GTA UG
[], // GTA IV [
// GTA IV
],
[], // GTA IV EFLC [], // GTA IV EFLC
[], // INVALID [], // INVALID
[], // INVALID [], // INVALID