Emtec

diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index 20ac51d..1ca5f3c 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
 -705,7 +705,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
     pCurrChar->SendInitialPacketsAfterAddToMap();
 
     CharacterDatabase.PExecute("UPDATE characters SET online = 1 WHERE guid = '%u'", pCurrChar->GetGUIDLow());
-    loginDatabase.PExecute("UPDATE account SET online = 1 WHERE id = '%u'", GetAccountId());
+    loginDatabase.PExecute("UPDATE account SET online = 1, ActiveRealmID = %d WHERE id = '%u'", realmID, GetAccountId());

Emtec

diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index 512da99..06a0ff6 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -568,6 +568,15 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
         return;
     }
 
+	if(!pCurrChar->CheckAccessRealm(playerGuid))
+	{

Emtec

diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index 512da99..06a0ff6 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -568,6 +568,15 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
         return;
     }
 
+	if(!pCurrChar->CheckAccessRealm(playerGuid))
+	{

Emtec

diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 1de190b..39218a1 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -29,7 +29,7 @@
 
 #include "WorldSocket.h"
 #include "Common.h"
-
+#include "Config/ConfigEnv.h"

Emtec

diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 1de190b..0c1db34 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -30,6 +30,8 @@
 #include "WorldSocket.h"
 #include "Common.h"
 
+#include "Config/ConfigEnv.h"
+

Emtec

diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 1de190b..fadf92d 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -30,6 +30,8 @@
 #include "WorldSocket.h"
 #include "Common.h"
 
+#include "Config/ConfigEnv.h"
+

Emtec

diff --git a/src/game/World.cpp b/src/game/World.cpp
index c6e978b..0395494 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1871,6 +1871,12 @@ void World::KickAll()
         itr->second->KickPlayer();
 }
 
+// Reset active_realm_id from account table
+void World::ResetRealmId()

Emtec

diff --git a/sql/mangos.sql b/sql/mangos.sql
index c26a0d2..15ad515 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -2920,7 +2920,7 @@ INSERT INTO `mangos_string` VALUES
 (9,'Commands available to you:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (10,'Incorrect syntax.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (11,'Your account level is: %i',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(12,'Online players: %u (max: %u) Queued players: %u (max: %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(12,'Online players: %u (max: %u) Queued players: %u (max: %u) Player Limit: %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),

Emtec

diff --git a/sql/v01_vehicle_data.sql b/sql/v01_vehicle_data.sql
new file mode 100644
index 0000000..74dc665
--- /dev/null
+++ b/sql/v01_vehicle_data.sql
@@ -0,0 +1,21 @@
+--
+-- Table structure for table `vehicle_data`
+--
+

Emtec

diff --git a/sql/updates/10205_a_mangos_mail_template.sql b/sql/updates/10205_a_mangos_mail_template.sql
new file mode 100644
index 0000000..06f302e
--- /dev/null
+++ b/sql/updates/10205_a_mangos_mail_template.sql
@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS `mail_template` (
+  `id` mediumint(8) NOT NULL,
+  `title` text character set utf8 NOT NULL,
+  `text` text character set utf8 NOT NULL,