Core/Worldserver: Move the Realm instance into the game library

3 files changed, 3 insertions, 2 deletions

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index cd65fdd2bbd..862352d30bd 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -3473,6 +3473,8 @@ void World::RemoveOldCorpses()
     m_timers[WUPDATE_CORPSES].SetCurrent(m_timers[WUPDATE_CORPSES].GetInterval());
 }
 
+Realm realm;
+
 uint32 GetVirtualRealmAddress()
 {
     return uint32(realm.Id.Region) << 24 | uint32(realm.Id.Site) << 16 | realm.Id.Realm;
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 3710a5596a0..1ccdec3e2dd 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -898,5 +898,6 @@ extern Realm realm;
 uint32 GetVirtualRealmAddress();
 
 #define sWorld World::instance()
+
 #endif
 /// @}
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 45bea2ad636..b26027e8960 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -80,8 +80,6 @@ uint32 _worldLoopCounter(0);
 uint32 _lastChangeMsTime(0);
 uint32 _maxCoreStuckTimeInMs(0);
 
-Realm realm;
-
 void SignalHandler(const boost::system::error_code& error, int signalNumber);
 void FreezeDetectorHandler(const boost::system::error_code& error);
 AsyncAcceptor* StartRaSocketAcceptor(boost::asio::io_service& ioService);