1 files changed, 8 insertions, 15 deletions
diff --git a/src/net/tmwa/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp
index c8aa27690..6e22de6ac 100644
--- a/src/net/tmwa/guildmanager.cpp
+++ b/src/net/tmwa/guildmanager.cpp
@@ -72,23 +72,16 @@ GuildManager::~GuildManager()
 
 void GuildManager::init()
 {
-    if (serverFeatures->haveNativeGuilds())
+    int val = serverConfig.getValue("enableGuildBot", -1);
+    if (val == -1)
     {
-        mEnableGuildBot = false;
-    }
-    else
-    {
-        int val = serverConfig.getValue("enableGuildBot", -1);
-        if (val == -1)
-        {
-            if (client->isTmw())
-                val = 1;
-            else
-                val = 0;
-            serverConfig.setValue("enableGuildBot", val);
-        }
-        mEnableGuildBot = val;
+        if (client->isTmw())
+            val = 1;
+        else
+            val = 0;
+        serverConfig.setValue("enableGuildBot", val);
     }
+    mEnableGuildBot = val;
     if (mEnableGuildBot)
     {
         if (!guildManager)