6 files changed, 8 insertions, 47 deletions
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index edd4498f9..95bdc764e 100644
--- a/src/net/eathena/serverfeatures.cpp
+++ b/src/net/eathena/serverfeatures.cpp
@@ -51,11 +51,6 @@ bool ServerFeatures::havePlayerStatusUpdate() const
     return serverVersion > 0;
 }
 
-bool ServerFeatures::haveNativeGuilds() const
-{
-    return true;
-}
-
 bool ServerFeatures::haveIncompleteChatMessages() const
 {
     return false;
@@ -71,11 +66,6 @@ bool ServerFeatures::haveLookSelection() const
     return serverVersion > 0;
 }
 
-bool ServerFeatures::haveChatChannels() const
-{
-    return true;
-}
-
 bool ServerFeatures::haveServerIgnore() const
 {
     return true;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index 91d59345d..21725dfc5 100644
--- a/src/net/eathena/serverfeatures.h
+++ b/src/net/eathena/serverfeatures.h
@@ -40,16 +40,12 @@ class ServerFeatures final : public Net::ServerFeatures
 
         bool havePlayerStatusUpdate() const override final;
 
-        bool haveNativeGuilds() const override final A_CONST;
-
         bool haveIncompleteChatMessages() const override final A_CONST;
 
         bool haveRaceSelection() const override final;
 
         bool haveLookSelection() const override final;
 
-        bool haveChatChannels() const override final A_CONST;
-
         bool haveServerIgnore() const override final A_CONST;
 
         bool haveMove3() const override final;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index 009c5cee1..2755efbaa 100644
--- a/src/net/serverfeatures.h
+++ b/src/net/serverfeatures.h
@@ -42,16 +42,12 @@ class ServerFeatures notfinal
 
         virtual bool havePlayerStatusUpdate() const = 0;
 
-        virtual bool haveNativeGuilds() const = 0;
-
         virtual bool haveIncompleteChatMessages() const = 0;
 
         virtual bool haveRaceSelection() const = 0;
 
         virtual bool haveLookSelection() const = 0;
 
-        virtual bool haveChatChannels() const = 0;
-
         virtual bool haveServerIgnore() const = 0;
 
         virtual bool haveMove3() const = 0;
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)
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index 8cd73884c..1363ac507 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -49,11 +49,6 @@ bool ServerFeatures::havePlayerStatusUpdate() const
     return false;
 }
 
-bool ServerFeatures::haveNativeGuilds() const
-{
-    return false;
-}
-
 bool ServerFeatures::haveIncompleteChatMessages() const
 {
     return tmwServerVersion <= 0x100209;
@@ -69,11 +64,6 @@ bool ServerFeatures::haveLookSelection() const
     return false;
 }
 
-bool ServerFeatures::haveChatChannels() const
-{
-    return false;
-}
-
 bool ServerFeatures::haveServerIgnore() const
 {
     return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index 0f0b43547..a252f3f61 100644
--- a/src/net/tmwa/serverfeatures.h
+++ b/src/net/tmwa/serverfeatures.h
@@ -40,16 +40,12 @@ class ServerFeatures final : public Net::ServerFeatures
 
         bool havePlayerStatusUpdate() const override final A_CONST;
 
-        bool haveNativeGuilds() const override final;
-
         bool haveIncompleteChatMessages() const override final;
 
         bool haveRaceSelection() const override final A_CONST;
 
         bool haveLookSelection() const override final A_CONST;
 
-        bool haveChatChannels() const override final A_CONST;
-
         bool haveServerIgnore() const override final;
 
         bool haveMove3() const override final;