make configs actually

hatersgit · Mar 8, 2024 · e42ff16 · e42ff16
1 parent 6832920
commit e42ff16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -703,8 +703,10 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo
     }
     // all item positions resolved
     UpdateThorns();
-    if (Guild* guild = sGuildMgr->GetGuildById(DEFAULT_GUILD)) {
-        guild->AddMemberOnCreate(this);
+    if (sConfigMgr->GetBoolDefault("StarterGuild.autojoin", false)) {
+        if (Guild* guild = sGuildMgr->GetGuildById(sConfigMgr->GetIntDefault("StarterGuild.id", 0))) {
+            guild->AddMemberOnCreate(this);
+        }
     }
 
     CheckAllAchievementCriteria();

diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
@@ -40,8 +40,6 @@ namespace WorldPackets
     }
 }
 
-#define DEFAULT_GUILD 1
-
 enum GuildMisc
 {
     GUILD_BANK_MAX_TABS                 = 6,                    // send by client for money log also
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,8 +40,6 @@ namespace WorldPackets @@
         }
     }
-    #define DEFAULT_GUILD 1
     enum GuildMisc
     {
         GUILD_BANK_MAX_TABS                 = 6,                    // send by client for money log also
@@ Expand Down @@