3 files changed, 16 insertions, 7 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 71030d748..bf919ce84 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -202,12 +202,8 @@ void GeneralHandler::gameStarted() const
 void GeneralHandler::gameEnded() const
 {
     if (socialWindow)
-    {
-        socialWindow->removeTab(Ea::taGuild);
         socialWindow->removeTab(Ea::taParty);
-    }
 
-    delete2(guildTab);
     delete2(partyTab);
 }
 
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 0b3c03990..d3312c727 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -29,7 +29,7 @@ namespace TmwAthena
 {
 
 GuildHandler::GuildHandler() :
-    Ea::GuildHandler()
+    Net::GuildHandler()
 {
     guildHandler = this;
 }
@@ -38,6 +38,15 @@ GuildHandler::~GuildHandler()
 {
 }
 
+void GuildHandler::clear() const
+{
+}
+
+ChatTab *GuildHandler::getTab() const
+{
+    return nullptr;
+}
+
 void GuildHandler::create(const std::string &name A_UNUSED) const
 {
 }
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 16dc3c0df..ff5de76cb 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -22,12 +22,12 @@
 #ifndef NET_TMWA_GUILDHANDLER_H
 #define NET_TMWA_GUILDHANDLER_H
 
-#include "net/ea/guildhandler.h"
+#include "net/guildhandler.h"
 
 namespace TmwAthena
 {
 
-class GuildHandler final : public Ea::GuildHandler
+class GuildHandler final : public Net::GuildHandler
 {
     public:
         GuildHandler();
@@ -36,6 +36,10 @@ class GuildHandler final : public Ea::GuildHandler
 
         ~GuildHandler();
 
+        void clear() const override final;
+
+        ChatTab *getTab() const override final;
+
         void create(const std::string &name) const override final;
 
         void invite(const std::string &name) const override final;