diff --git a/sql/updates/world/2016_02_07_15_world.sql b/sql/updates/world/2016_02_07_15_world.sql
deleted file mode 100644
index 8b137891791fe..0000000000000
--- a/sql/updates/world/2016_02_07_15_world.sql
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sql/updates/world/2016_04_02_41_world_2016_02_07_15_world.sql b/sql/updates/world/2016_04_02_41_world_2016_02_07_15_world.sql
new file mode 100644
index 0000000000000..51bee2e5a87bd
--- /dev/null
+++ b/sql/updates/world/2016_04_02_41_world_2016_02_07_15_world.sql
@@ -0,0 +1,173 @@
+SET @Guid := 52030;
+
+DELETE FROM `creature` WHERE `id` IN(37964,37981,36817);
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES 
+(@Guid, 37964, 0, 0, 0, 1, 1, 0, 0, 1484.662, 348.019, -64.54687, 0.8377581, 120, 0, 0, 1, 0, 0, 0, 0, 0, 0),
+(@Guid+1, 37981, 1, 0, 0, 1, 1, 0, 0, 9843.134, 2430.733, 1313.6, 5.5676, 120, 0, 0, 1, 0, 0, 0, 0, 0, 0),
+(@Guid+2, 36817, 0, 0, 0, 1, 1, 0, 0, -8796.021, 775.0364, 95.22309, 0.01745329, 120, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+
+DELETE FROM `game_event_creature` WHERE `eventEntry`=8 AND `guid` BETWEEN @Guid AND @Guid+2;
+INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES 
+(8, @Guid),
+(8, @Guid+1),
+(8, @Guid+2);
+
+UPDATE `creature_template` SET `InhabitType`=4,`npcflag`=16777216,`VehicleId`=616,`IconName`='vehichleCursor' WHERE `entry` =37966;
+UPDATE `creature_template` SET `InhabitType`=4,`npcflag`=16777216,`VehicleId`=615,`IconName`='vehichleCursor' WHERE `entry` =37980;
+UPDATE `creature_template` SET `InhabitType`=4,`npcflag`=16777216,`VehicleId`=548,`IconName`='vehichleCursor' WHERE `entry`=36812;
+
+UPDATE `creature_template` SET `ainame`='SmartAI', `scriptname`='' WHERE `entry` IN(37966,37964,37981,37980,36817,36812);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(37966,37964,37980,37981,36817,36812) AND `source_type`=0;
+
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(37964, 0, 0, 0, 1, 0, 100, 0, 0, 0, 20000, 20000, 11, 70846, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, '[DND] Love Boat Summoner 02 - OOC - Cast Love Boat Summon'),
+(37981, 0, 0, 0, 1, 0, 100, 0, 0, 0, 20000, 20000, 11, 70863, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, '[DND] Love Boat Summoner 03 - OOC - Cast Love Boat Summon'),
+(36817, 0, 0, 0, 1, 0, 100, 0, 0, 0, 20000, 20000, 11, 69371, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, '[DND] Love Boat Summoner - OOC - Cast Love Boat Summon'),
+(37964, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, '[DND] Love Boat Summoner 02 - On Spawn - Set Active'),
+(37981, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, '[DND] Love Boat Summoner 03 - On Spawn - Set Active'),
+(36817, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, '[DND] Love Boat Summoner - On Spawn - Set Active'),
+(37966, 0, 0, 0, 1, 0, 100, 1, 5000, 5000, 0, 0, 53, 0, 37966, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Undercity Love Boat - OOC - Start WP'),
+(37966, 0, 1, 2, 40, 0, 100, 0, 31, 37966, 0, 0, 11, 50630, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Undercity Love Boat - On Reached WP31 - Cast Eject All Passengers'),
+(37966, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 2000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Undercity Love Boat - On Reached WP31 - Despawn'),
+(37966, 0, 3, 4, 54, 0, 100, 0, 0, 0, 0, 0, 11, 70143, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Undercity Love Boat - On Just Summoned - Cast Vehicle Test'),
+(37966, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Undercity Love Boat - On Just Summoned - Set Active'),
+(37966, 0, 5, 0, 1, 0, 100, 0, 0, 0, 3000, 3000, 75, 69341, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Undercity Love Boat - OOC - Cast Love Boat'),
+(37966, 0, 6, 0, 23, 0, 100, 0, 69342, 2, 1000, 1000, 75, 62011, 0, 0, 0, 0, 0, 17, 0, 20, 0, 0, 0, 0, 0, 'Undercity Love Boat - On Has Aura (2) - Add Aura'),
+(37966, 0, 7, 0, 28, 0, 100, 0, 0, 0, 0, 0, 28, 62011, 0, 0, 0, 0, 0, 17, 0, 20, 0, 0, 0, 0, 0, 'Undercity Love Boat - On Passenger Dismounted - Remove Aura'),
+(37980, 0, 0, 0, 1, 0, 100, 1, 5000, 5000, 0, 0, 53, 0, 37980, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darnassus Love Boat - OOC - Start WP'),
+(37980, 0, 1, 2, 40, 0, 100, 0, 60, 37980, 0, 0, 11, 50630, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darnassus Love Boat - On Reached WP60 - Cast Eject All Passengers'),
+(37980, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 2000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darnassus Love Boat - On Reached WP31 - Despawn'),
+(37980, 0, 3, 4, 54, 0, 100, 0, 0, 0, 0, 0, 11, 70143, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darnassus Love Boat - On Just Summoned - Cast Vehicle Test'),
+(37980, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darnassus Love Boat - On Just Summoned - Set Active'),
+(37980, 0, 5, 0, 1, 0, 100, 0, 0, 0, 3000, 3000, 75, 69341, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darnassus Love Boat - On Passenger Boarded - Cast Love Boat'),
+(37980, 0, 6, 0, 23, 0, 100, 0, 69342, 2, 1000, 1000, 75, 62011, 0, 0, 0, 0, 0, 17, 0, 20, 0, 0, 0, 0, 0, 'Darnassus Love Boat - On Has Aura (2) - Add Aura'),
+(37980, 0, 7, 0, 28, 0, 100, 0, 0, 0, 0, 0, 28, 62011, 0, 0, 0, 0, 0, 17, 0, 20, 0, 0, 0, 0, 0, 'Darnassus Love Boat - On Passenger Removed - Remove Aura'),
+(36812, 0, 0, 0, 1, 0, 100, 1, 5000, 5000, 0, 0, 53, 0, 36812, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stormwind Love Boat - OOC - Start WP'),
+(36812, 0, 1, 2, 40, 0, 100, 0, 21, 36812, 0, 0, 11, 50630, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stormwind Love Boat - On Reached WP21 - Cast Eject All Passengers'),
+(36812, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 2000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stormwind Love Boat - On Reached 19 - Despawn'),
+(36812, 0, 3, 4, 54, 0, 100, 0, 0, 0, 0, 0, 11, 70143, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stormwind Love Boat - On Just Summoned - Cast Vehicle Test'),
+(36812, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stormwind - Love Boat - On Just Summoned - Set Active'),
+(36812, 0, 5, 0, 1, 0, 100, 0, 0, 0, 3000, 3000, 75, 69341, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stormwind Love Boat - OOC - Cast Love Boat'),
+(36812, 0, 6, 0, 23, 0, 100, 0, 69342, 2, 1000, 1000, 75, 62011, 0, 0, 0, 0, 0, 17, 0, 20, 0, 0, 0, 0, 0, 'Stormwind Love Boat - On Has Aura (2) - Add Aura'),
+(36812, 0, 7, 0, 28, 0, 100, 0, 0, 0, 0, 0, 28, 62011, 0, 0, 0, 0, 0, 17, 0, 20, 0, 0, 0, 0, 0, 'Stormwind Love Boat - On Pasenger Removed - Remove Aura');
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`IN(37966,37980,36812);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES 
+(37966, 69342, 1, 0),
+(37980, 69342, 1, 0),
+(36812, 69342, 1, 0);
+
+
+DELETE FROM `waypoints` WHERE `entry` IN(37966,37980,36812);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(37966, 1, 1485.332, 348.7621, -64.54687, 'Undercity Love Boat'),
+(37966, 2, 1487.063, 350.9445, -64.86743, 'Undercity Love Boat'),
+(37966, 3, 1494.434, 360.592, -64.86742, 'Undercity Love Boat'),
+(37966, 4, 1505.792, 368.026, -64.81186, 'Undercity Love Boat'),
+(37966, 5, 1520.413, 376.7361, -64.81187, 'Undercity Love Boat'),
+(37966, 6, 1542.724, 389.7309, -64.81187, 'Undercity Love Boat'),
+(37966, 7, 1555.352, 393.1875, -64.81187, 'Undercity Love Boat'),
+(37966, 8, 1577.076, 397.1563, -64.81187, 'Undercity Love Boat'),
+(37966, 9, 1618.071, 395.9705, -64.81187, 'Undercity Love Boat'),
+(37966, 10, 1642.727, 391.0139, -64.81187, 'Undercity Love Boat'),
+(37966, 11, 1685.007, 370.4167, -64.81187, 'Undercity Love Boat'),
+(37966, 12, 1711.104, 350.4514, -64.81187, 'Undercity Love Boat'),
+(37966, 13, 1738.417, 310.0278, -64.81187, 'Undercity Love Boat'),
+(37966, 14, 1746.345, 286.441, -64.81187, 'Undercity Love Boat'),
+(37966, 15, 1752.087, 240.5399, -64.81187, 'Undercity Love Boat'),
+(37966, 16, 1750.016, 206.7309, -64.81187, 'Undercity Love Boat'),
+(37966, 17, 1737.47, 167.8559, -64.81187, 'Undercity Love Boat'),
+(37966, 18, 1707.885, 128.5122, -64.81187, 'Undercity Love Boat'),
+(37966, 19, 1667.977, 99.80035, -64.81187, 'Undercity Love Boat'),
+(37966, 20, 1624.948, 85.43229, -64.81187, 'Undercity Love Boat'),
+(37966, 21, 1583.814, 83.33507, -64.81187, 'Undercity Love Boat'),
+(37966, 22, 1539.444, 94.43403, -64.81187, 'Undercity Love Boat'),
+(37966, 23, 1502.849, 114.3142, -64.81187, 'Undercity Love Boat'),
+(37966, 24, 1482.955, 132.6806, -64.81187, 'Undercity Love Boat'),
+(37966, 25, 1456.214, 170.0521, -64.81187, 'Undercity Love Boat'),
+(37966, 26, 1441.738, 207.8819, -64.81187, 'Undercity Love Boat'),
+(37966, 27, 1438.825, 244.4427, -64.81187, 'Undercity Love Boat'),
+(37966, 28, 1450.882, 299.3177, -64.81187, 'Undercity Love Boat'),
+(37966, 29, 1462.38, 320.4583, -64.81187, 'Undercity Love Boat'),
+(37966, 30, 1467.97, 333.1337, -64.81187, 'Undercity Love Boat'),
+(37966, 31, 1471.193, 337.8559, -64.81187, 'Undercity Love Boat'),
+(37980, 1, 9843.134, 2430.733, 1313.6, 'Darnassus Love Boat'),
+(37980, 2, 9847.023, 2427.627, 1313.516, 'Darnassus Love Boat'),
+(37980, 3, 9856.224, 2423.156, 1313.516, 'Darnassus Love Boat'),
+(37980, 4, 9871.393, 2416.719, 1313.516, 'Darnassus Love Boat'),
+(37980, 5, 9888.688, 2408.337, 1313.516, 'Darnassus Love Boat'),
+(37980, 6, 9901.832, 2399.545, 1313.516, 'Darnassus Love Boat'),
+(37980, 7, 9915.912, 2390.616, 1313.516, 'Darnassus Love Boat'),
+(37980, 8, 9930.722, 2381.382, 1313.516, 'Darnassus Love Boat'),
+(37980, 9, 9946.339, 2377.861, 1313.516, 'Darnassus Love Boat'),
+(37980, 10, 9964.972, 2377.967, 1313.516, 'Darnassus Love Boat'),
+(37980, 11, 9977.46, 2379.141, 1313.516, 'Darnassus Love Boat'),
+(37980, 12, 9989.397, 2375.556, 1313.516, 'Darnassus Love Boat'),
+(37980, 13, 10006.68, 2364.491, 1313.516, 'Darnassus Love Boat'),
+(37980, 14, 10022.01, 2353.608, 1313.516, 'Darnassus Love Boat'),
+(37980, 15, 10031.78, 2353.427, 1313.516, 'Darnassus Love Boat'),
+(37980, 16, 10041.6, 2366.207, 1313.516, 'Darnassus Love Boat'),
+(37980, 17, 10043.1, 2373.267, 1313.516, 'Darnassus Love Boat'),
+(37980, 18, 10040.94, 2384.248, 1313.516, 'Darnassus Love Boat'),
+(37980, 19, 10040.11, 2396.392, 1313.516, 'Darnassus Love Boat'),
+(37980, 20, 10043.54, 2406.759, 1313.516, 'Darnassus Love Boat'),
+(37980, 21, 10051.08, 2414.868, 1313.516, 'Darnassus Love Boat'),
+(37980, 22, 10059.58, 2421.014, 1313.516, 'Darnassus Love Boat'),
+(37980, 23, 10061.45, 2433.856, 1313.516, 'Darnassus Love Boat'),
+(37980, 24, 10056.65, 2445.88, 1313.516, 'Darnassus Love Boat'),
+(37980, 25, 10049.1, 2453.844, 1313.516, 'Darnassus Love Boat'),
+(37980, 26, 10039.64, 2458.193, 1313.516, 'Darnassus Love Boat'),
+(37980, 27, 10030.21, 2461.353, 1313.516, 'Darnassus Love Boat'),
+(37980, 28, 10013.85, 2465.007, 1313.516, 'Darnassus Love Boat'),
+(37980, 29, 10007.3, 2472.648, 1313.516, 'Darnassus Love Boat'),
+(37980, 30, 10001.77, 2490.97, 1313.516, 'Darnassus Love Boat'),
+(37980, 31, 10007.02, 2503.859, 1313.516, 'Darnassus Love Boat'),
+(37980, 32, 10014.66, 2519.925, 1313.516, 'Darnassus Love Boat'),
+(37980, 33, 10022.5, 2532.248, 1313.516, 'Darnassus Love Boat'),
+(37980, 34, 10032.06, 2559.106, 1313.516, 'Darnassus Love Boat'),
+(37980, 35, 10032.88, 2579.188, 1313.516, 'Darnassus Love Boat'),
+(37980, 36, 10032.36, 2598.909, 1313.516, 'Darnassus Love Boat'),
+(37980, 37, 10029.7, 2612.815, 1313.516, 'Darnassus Love Boat'),
+(37980, 38, 10022.64, 2648.693, 1313.516, 'Darnassus Love Boat'),
+(37980, 39, 9999.638, 2667.306, 1313.516, 'Darnassus Love Boat'),
+(37980, 40, 9985.304, 2673.353, 1313.516, 'Darnassus Love Boat'),
+(37980, 41, 9967.442, 2671.7, 1313.516, 'Darnassus Love Boat'),
+(37980, 42, 9938.718, 2668.114, 1313.516, 'Darnassus Love Boat'),
+(37980, 43, 9898.393, 2665.895, 1313.516, 'Darnassus Love Boat'),
+(37980, 44, 9874.026, 2660.383, 1313.516, 'Darnassus Love Boat'),
+(37980, 45, 9848.894, 2657.903, 1313.516, 'Darnassus Love Boat'),
+(37980, 46, 9834.57, 2658.452, 1313.516, 'Darnassus Love Boat'),
+(37980, 47, 9820.689, 2652.576, 1313.516, 'Darnassus Love Boat'),
+(37980, 48, 9802.497, 2636.835, 1313.516, 'Darnassus Love Boat'),
+(37980, 49, 9795.239, 2622.99, 1313.516, 'Darnassus Love Boat'),
+(37980, 50, 9785.92, 2605.789, 1313.516, 'Darnassus Love Boat'),
+(37980, 51, 9784.899, 2593.911, 1313.516, 'Darnassus Love Boat'),
+(37980, 52, 9793.405, 2574.175, 1313.516, 'Darnassus Love Boat'),
+(37980, 53, 9812.471, 2555.666, 1313.516, 'Darnassus Love Boat'),
+(37980, 54, 9829.779, 2539.537, 1313.516, 'Darnassus Love Boat'),
+(37980, 55, 9841.714, 2520.574, 1313.516, 'Darnassus Love Boat'),
+(37980, 56, 9847.395, 2499.439, 1313.516, 'Darnassus Love Boat'),
+(37980, 57, 9850.591, 2481.936, 1313.516, 'Darnassus Love Boat'),
+(37980, 58, 9846.033, 2466.465, 1313.516, 'Darnassus Love Boat'),
+(37980, 59, 9838.938, 2451.995, 1313.516, 'Darnassus Love Boat'),
+(37980, 60, 9833.917, 2446.236, 1313.516, 'Darnassus Love Boat'),
+(36812, 1, -8787.234, 781.7327, 95.0583, 'Stormwind Love Boat'),
+(36812, 2, -8775.955, 785.2083, 95.0583, 'Stormwind Love Boat'),
+(36812, 3, -8767.88, 779.361, 95.0583, 'Stormwind Love Boat'),
+(36812, 4, -8757.16, 764.092, 95.0583, 'Stormwind Love Boat'),
+(36812, 5, -8748.27, 743.734, 95.0861, 'Stormwind Love Boat'),
+(36812, 6, -8730.62, 719.509, 95.0861, 'Stormwind Love Boat'),
+(36812, 7, -8715.05, 699.875, 95.0583, 'Stormwind Love Boat'),
+(36812, 8, -8694.17, 664.962, 95.0583, 'Stormwind Love Boat'),
+(36812, 9, -8685.99, 630.592, 95.1139, 'Stormwind Love Boat'),
+(36812, 10, -8690.34, 598.566, 95.0861, 'Stormwind Love Boat'),
+(36812, 11, -8696.74, 580.993, 95.0583, 'Stormwind Love Boat'),
+(36812, 12, -8688.68, 568.481, 95.0583, 'Stormwind Love Boat'),
+(36812, 13, -8671.31, 568.135, 95.0583, 'Stormwind Love Boat'),
+(36812, 14, -8646.7, 565.684, 95.0583, 'Stormwind Love Boat'),
+(36812, 15, -8630.28, 558.753, 95.0583, 'Stormwind Love Boat'),
+(36812, 16,-8610.02, 578.516, 95.0583, 'Stormwind Love Boat'),
+(36812, 17, -8605.92, 596.785, 95.0583, 'Stormwind Love Boat'),
+(36812, 18, -8596.16, 618.727, 95.0583, 'Stormwind Love Boat'),
+(36812, 19, -8581.41, 626.602, 95.0861, 'Stormwind Love Boat');