diff --git a/scripts/server/account.js b/scripts/server/account.js index ff9764c5..87be5779 100644 --- a/scripts/server/account.js +++ b/scripts/server/account.js @@ -599,7 +599,6 @@ function loginSuccess(client) { getPlayerData(client).accountData.ipAddress = client.ip; - //sendRemovedWorldObjectsToPlayer(client); sendPlayerChatScrollLines(client, getPlayerData(client).accountData.chatScrollLines); messagePlayerNormal(null, `👋 ${getPlayerName(client)} has joined the server`, getColourByName("softYellow")); diff --git a/scripts/server/class.js b/scripts/server/class.js index 6219c2d1..c080fa38 100644 --- a/scripts/server/class.js +++ b/scripts/server/class.js @@ -62,11 +62,11 @@ class ServerData { this.antiCheat = { enabled: false, - checkGameScripts: false, - gameScriptWhiteListEnabled: false, - gameScriptBlackListEnabled: false, - gameScriptWhiteList: [], - gameScriptBlackList: [], + //checkGameScripts: false, + //gameScriptWhiteListEnabled: false, + //gameScriptBlackListEnabled: false, + //gameScriptWhiteList: [], + //gameScriptBlackList: [], }; this.discordBotToken = ""; @@ -126,11 +126,11 @@ class ServerData { this.antiCheat = { enabled: hasBitFlag(this.settings, getServerSettingsFlagValue("Anticheat")), - checkGameScripts: hasBitFlag(this.settings, getServerSettingsFlagValue("CheckGameScripts")), - gameScriptBlackListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptBlackList")), - gameScriptWhiteListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptWhiteList")), - gameScriptWhiteList: [], - gameScriptBlackList: [], + //checkGameScripts: hasBitFlag(this.settings, getServerSettingsFlagValue("CheckGameScripts")), + //gameScriptBlackListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptBlackList")), + //gameScriptWhiteListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptWhiteList")), + //gameScriptWhiteList: [], + //gameScriptBlackList: [], }; this.discordBotToken = intToBool(dbAssoc["svr_discord_bot_token"]); @@ -263,6 +263,8 @@ class ClientData { this.locale = 0; this.enteringVehicle = null; + + this.pedId = -1; } }; @@ -672,7 +674,7 @@ class HouseData { this.itemCache = []; this.locations = []; - this.gameScripts = []; + //this.gameScripts = []; this.entrancePosition = false; this.entranceRotation = 0.0; diff --git a/scripts/shared/gamedata.js b/scripts/shared/gamedata.js index 31d9fe6d..2f63d3ff 100644 --- a/scripts/shared/gamedata.js +++ b/scripts/shared/gamedata.js @@ -2541,7 +2541,7 @@ let gameData = { [594, "BeerCan"], [592, "BottleYellow"], [500, "ArmourVest"], - [510, "PizzzBox"], + [510, "PizzaBox"], [597, "SodaBottle"], [502, "GenericPackage2"] ], @@ -2603,7 +2603,9 @@ let gameData = { [2601, "CanSoda"], ], [], // GTA UG - [], // GTA IV + [ + // GTA IV + ], [], // GTA IV EFLC [], // INVALID [], // INVALID