diff options
5 files changed, 22 insertions, 3 deletions
diff --git a/sql/updates/world/2014_07_06_01_world_misc.sql b/sql/updates/world/2014_07_06_01_world_misc.sql new file mode 100644 index 00000000000..ff7e226bdd9 --- /dev/null +++ b/sql/updates/world/2014_07_06_01_world_misc.sql @@ -0,0 +1,10 @@ +-- +SET @GUID=5412; + +DELETE FROM `gameobject` WHERE `id`=188367; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES +(@GUID,188367,571,1,1,5048.28,-4817.63,219.778,2.49582,0,0,0,1,-60,255,1,0); + +DELETE FROM `event_scripts` WHERE `id`=17566; +INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES +(17566,0,9,@GUID,60,0,0,0,0,0); diff --git a/sql/updates/world/2014_07_06_02_world_misc.sql b/sql/updates/world/2014_07_06_02_world_misc.sql new file mode 100644 index 00000000000..7ff6e74d003 --- /dev/null +++ b/sql/updates/world/2014_07_06_02_world_misc.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature_template` SET `npcflag`=16777216 WHERE `entry`=25743; +DELETE FROM `creature_loot_template` WHERE `entry`=25802 AND `item`=35234; +UPDATE `item_template` SET `flagsCustom`=1 WHERE `entry`=44834; diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index 5555f2a824c..41539b9cda6 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -41,14 +41,14 @@ BattlefieldWG::~BattlefieldWG() bool BattlefieldWG::SetupBattlefield() { - InitStalker(BATTLEFIELD_WG_NPC_STALKER, WintergraspStalkerPos[0], WintergraspStalkerPos[1], WintergraspStalkerPos[2], WintergraspStalkerPos[3]); - m_TypeId = BATTLEFIELD_WG; // See enum BattlefieldTypes m_BattleId = BATTLEFIELD_BATTLEID_WG; m_ZoneId = BATTLEFIELD_WG_ZONEID; m_MapId = BATTLEFIELD_WG_MAPID; m_Map = sMapMgr->FindMap(m_MapId, 0); + InitStalker(BATTLEFIELD_WG_NPC_STALKER, WintergraspStalkerPos[0], WintergraspStalkerPos[1], WintergraspStalkerPos[2], WintergraspStalkerPos[3]); + m_MaxPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MAX); m_IsEnabled = sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE); m_MinPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MIN); diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index a1ee67fe6e4..21572858b2b 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -119,6 +119,9 @@ bool Map::ExistVMap(uint32 mapid, int gx, int gy) void Map::LoadMMap(int gx, int gy) { + if (!MMAP::MMapFactory::IsPathfindingEnabled(GetId())) + return; + bool mmapLoadResult = MMAP::MMapFactory::createOrGetMMapManager()->loadMap((sWorld->GetDataPath() + "mmaps").c_str(), GetId(), gx, gy); if (mmapLoadResult) @@ -129,6 +132,8 @@ void Map::LoadMMap(int gx, int gy) void Map::LoadVMap(int gx, int gy) { + if (!VMAP::VMapFactory::createOrGetVMapManager()->isMapLoadingEnabled()) + return; // x and y are swapped !! int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath()+ "vmaps").c_str(), GetId(), gx, gy); switch (vmapLoadResult) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index e0050420a08..1f8ccfbd5d8 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -159,7 +159,7 @@ class instance_magisters_terrace : public InstanceMapScript switch (type) { case DATA_DELRISSA: - if (type == IN_PROGRESS) + if (state == IN_PROGRESS) DelrissaDeathCount = 0; break; default: |