Update from master (merge error)

This commit is contained in:
Vortrex
2023-02-07 15:11:56 -06:00
parent a5b9840729
commit 1e91698e05
63 changed files with 422 additions and 223 deletions

View File

@@ -109,15 +109,15 @@ class ClanMemberData {
// ===========================================================================
function initClanScript() {
logToConsole(LOG_INFO, "[AGRP.Clan]: Initializing clans script ...");
logToConsole(LOG_INFO, "[AGRP.Clan]: Clan script initialized successfully!");
logToConsole(LOG_INFO, "[V.RP.Clan]: Initializing clans script ...");
logToConsole(LOG_INFO, "[V.RP.Clan]: Clan script initialized successfully!");
return true;
}
// ===========================================================================
function loadClansFromDatabase() {
logToConsole(LOG_INFO, "[AGRP.Clan]: Loading clans from database ...");
logToConsole(LOG_INFO, "[V.RP.Clan]: Loading clans from database ...");
let tempClans = [];
let dbConnection = connectToDatabase();
@@ -145,7 +145,7 @@ function loadClansFromDatabase() {
// ===========================================================================
function loadClanMembersFromDatabase() {
logToConsole(LOG_INFO, "[AGRP.Clan]: Loading clans from database ...");
logToConsole(LOG_INFO, "[V.RP.Clan]: Loading clans from database ...");
let tempClans = [];
let dbConnection = connectToDatabase();