4 files changed, 6 insertions, 0 deletions
diff --git a/src/net/eathena/questhandler.cpp b/src/net/eathena/questhandler.cpp
index 3c26ae770..76dad59a9 100644
--- a/src/net/eathena/questhandler.cpp
+++ b/src/net/eathena/questhandler.cpp
@@ -47,6 +47,7 @@ QuestHandler::QuestHandler() :
         0
     };
     handledMessages = _messages;
+    questHandler = this;
 }
 
 void QuestHandler::handleMessage(Net::MessageIn &msg)
diff --git a/src/net/net.cpp b/src/net/net.cpp
index f11e4c3b6..14d06bc76 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -57,6 +57,7 @@ namespace Net
     class PartyHandler;
     class PetHandler;
     class PlayerHandler;
+    class QuestHandler;
 }
 
 Net::AdminHandler *adminHandler = nullptr;
@@ -81,6 +82,7 @@ Net::AuctionHandler *auctionHandler = nullptr;
 Net::CashShopHandler *cashShopHandler = nullptr;
 Net::FamilyHandler *familyHandler = nullptr;
 Net::BankHandler *bankHandler = nullptr;
+Net::QuestHandler *questHandler = nullptr;
 
 Net::SkillHandler *Net::getSkillHandler()
 {
diff --git a/src/net/questhandler.h b/src/net/questhandler.h
index 8ffad48e0..24da73598 100644
--- a/src/net/questhandler.h
+++ b/src/net/questhandler.h
@@ -40,4 +40,6 @@ class QuestHandler notfinal
 
 }  // namespace Net
 
+extern Net::QuestHandler *questHandler;
+
 #endif  // NET_QUESTHANDLER_H
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index b49db8f29..fc3f7eee1 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -44,6 +44,7 @@ QuestHandler::QuestHandler() :
         0
     };
     handledMessages = _messages;
+    questHandler = this;
 }
 
 void QuestHandler::handleMessage(Net::MessageIn &msg)