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

Merge branch 'organizing' into separate-resources

Browse Source
This commit is contained in:
Vortrex
2022-06-14 07:37:15 -05:00
parent 736b7b1e69 06409be232
commit a4fdbd1398
46 changed files with 3059 additions and 2977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/server/startup.js
View File

@@ -10,7 +10,6 @@
function initServerScripts() {
checkForAllRequiredModules();
initClassScript();
initDatabaseScript();
initConfigScript();
initEmailScript();
@@ -118,6 +117,7 @@ function loadServerDataFromDatabase() {
// Always load these regardless of "test server" status
getServerData().allowedSkins = getAllowedSkins(getGame());
getServerData().itemTypes = loadItemTypesFromDatabase();
// Translation Cache
//getServerData().cachedTranslations = new Array(getGlobalConfig().locale.locales.length);
@@ -127,7 +127,6 @@ function loadServerDataFromDatabase() {
// Only load these if the server isn't a testing/dev server
if (!getServerConfig().devServer) {
getServerData().itemTypes = loadItemTypesFromDatabase();
getServerData().items = loadItemsFromDatabase();
getServerData().businesses = loadBusinessesFromDatabase();
getServerData().houses = loadHousesFromDatabase();