7 files changed, 6 insertions, 33 deletions

diff --git a/sql/updates/world/2011_10_28_00_world_version.sql b/sql/updates/world/2011_10_28_00_world_version.sql
new file mode 100644
index 00000000000..3d829193d1b
--- /dev/null
+++ b/sql/updates/world/2011_10_28_00_world_version.sql
@@ -0,0 +1 @@
+ALTER TABLE `version` DROP `script_version`;
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 120227c172d..925b352e616 100755
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -295,7 +295,6 @@ void ScriptMgr::Unload()
 
 void ScriptMgr::LoadDatabase()
 {
-    sScriptSystemMgr->LoadVersion();
     sScriptSystemMgr->LoadScriptTexts();
     sScriptSystemMgr->LoadScriptTextsCustom();
     sScriptSystemMgr->LoadScriptWaypoints();
diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index 8c6f5626101..d0f9a0380b0 100755
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -23,25 +23,6 @@
 
 ScriptPointVector const SystemMgr::_empty;
 
-void SystemMgr::LoadVersion()
-{
-    // Get Version information
-    QueryResult result = WorldDatabase.Query("SELECT script_version FROM version LIMIT 1");
-
-    if (result)
-    {
-        Field* fields = result->Fetch();
-
-        sLog->outString("TSCR: Database version is: %s", fields[0].GetCString());
-        sLog->outString();
-    }
-    else
-    {
-        sLog->outError("TSCR: Missing `version`.`script_version` information.");
-        sLog->outString();
-    }
-}
-
 void SystemMgr::LoadScriptTexts()
 {
     sLog->outString("TSCR: Loading Script Texts...");
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index a17033dc920..daa7fe0d596 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -64,7 +64,6 @@ class SystemMgr
         typedef UNORDERED_MAP<uint32, ScriptPointVector> PointMoveMap;
 
         //Database
-        void LoadVersion();
         void LoadScriptTexts();
         void LoadScriptTextsCustom();
         void LoadScriptWaypoints();
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 28657faedb1..408db187aae 100755
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2746,22 +2746,18 @@ void World::UpdateMaxSessionCounters()
 
 void World::LoadDBVersion()
 {
-    QueryResult result = WorldDatabase.Query("SELECT db_version, script_version, cache_id FROM version LIMIT 1");
+    QueryResult result = WorldDatabase.Query("SELECT db_version, cache_id FROM version LIMIT 1");
     if (result)
     {
         Field* fields = result->Fetch();
         m_DBVersion              = fields[0].GetString();
-        m_CreatureEventAIVersion = fields[1].GetString();
 
         // will be overwrite by config values if different and non-0
-        m_int_configs[CONFIG_CLIENTCACHE_VERSION] = fields[2].GetUInt32();
+        m_int_configs[CONFIG_CLIENTCACHE_VERSION] = fields[1].GetUInt32();
     }
 
     if (m_DBVersion.empty())
         m_DBVersion = "Unknown world database.";
-
-    if (m_CreatureEventAIVersion.empty())
-        m_CreatureEventAIVersion = "Unknown creature EventAI.";
 }
 
 void World::ProcessStartEvent()
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 06dc0066bb4..b493b8b0c7b 100755
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -722,10 +722,9 @@ class World
 
         LocaleConstant GetAvailableDbcLocale(LocaleConstant locale) const { if (m_availableDbcLocaleMask & (1 << locale)) return locale; else return m_defaultDbcLocale; }
 
-        //used World DB version
+        // used World DB version
         void LoadDBVersion();
         char const* GetDBVersion() const { return m_DBVersion.c_str(); }
-        char const* GetCreatureEventAIVersion() const { return m_CreatureEventAIVersion.c_str(); }
 
         void RecordTimeDiff(const char * text, ...);
 
@@ -821,13 +820,12 @@ class World
         //Player Queue
         Queue m_QueuedPlayer;
 
-        //sessions that are added async
+        // sessions that are added async
         void AddSession_(WorldSession* s);
         ACE_Based::LockedQueue<WorldSession*, ACE_Thread_Mutex> addSessQueue;
 
-        //used versions
+        // used versions
         std::string m_DBVersion;
-        std::string m_CreatureEventAIVersion;
 
         std::list<std::string> m_Autobroadcasts;
 
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 5260140fef0..42d72aa2c6f 100755
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -462,7 +462,6 @@ bool Master::_StartDB()
     sWorld->LoadDBVersion();
 
     sLog->outString("Using World DB: %s", sWorld->GetDBVersion());
-    sLog->outString("Using creature EventAI: %s", sWorld->GetCreatureEventAIVersion());
     return true;
 }