cyberium

diff --git a/src/game/GridMap.cpp b/src/game/GridMap.cpp
index 3bf9f0e..51dab15 100644
--- a/src/game/GridMap.cpp
+++ b/src/game/GridMap.cpp
@@ -952,10 +952,6 @@ GridMapLiquidStatus TerrainInfo::getLiquidStatus(float x, float y, float z, uint
             // All ok in water -> store data
             if (data)
             {
-                // hardcoded in client like this convert ocean to lava
-                if (GetMapId() == 530 && liquid_type == 2)

cyberium

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 0dac303..680ccba 100755
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -440,7 +440,7 @@ void ObjectMgr::LoadPointOfInterestLocales()
     sLog.outString(">> Loaded " SIZEFMTD " points_of_interest locale strings", mPointOfInterestLocaleMap.size());
 }
 
-struct SQLCreatureLoader : public SQLStorageLoaderBase<SQLCreatureLoader>
+struct SQLCreatureLoader : public SQLStorageLoaderBase<SQLCreatureLoader, SQLStorage>

cyberium

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 810d3d0..1b5e59b 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -178,7 +178,7 @@ Creature::Creature(CreatureSubtype subtype) : Unit(),
     m_CreatureSpellCooldowns.clear();
     m_CreatureCategoryCooldowns.clear();
 
-    SetWalk(true);
+    SetDefaultWalkMode(true);

cyberium

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index dc7e790..5f2f80b 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1249,29 +1249,6 @@ void DungeonMap::InitVisibilityDistance()
 */
 bool DungeonMap::CanEnter(Player* player)
 {
-    if (player->GetMapRef().getTarget() == this)
-    {

cyberium

diff --git a/sql/mangos.sql b/sql/mangos.sql
index 6865fd9..5effceb 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -141,7 +141,6 @@ CREATE TABLE `areatrigger_teleport` (
   `heroic_key2` mediumint(8) unsigned NOT NULL default '0',
   `required_quest_done` int(11) unsigned NOT NULL default '0',
   `required_quest_done_heroic` int(11) unsigned NOT NULL default '0',
-  `required_failed_text` text,
   `target_map` smallint(5) unsigned NOT NULL default '0',