Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

This commit is contained in:
Shauren
2013-06-23 14:51:52 +02:00
218 changed files with 1060 additions and 974 deletions

View File

@@ -0,0 +1,3 @@
-- Delete no longer used data from Characters Database
DELETE FROM `game_event_save` WHERE `eventEntry` BETWEEN 33 AND 47;
DELETE FROM `game_event_condition_save` WHERE `eventEntry` BETWEEN 33 AND 47;

View File

@@ -0,0 +1,14 @@
UPDATE `creature` SET `modelid`=0, `curhealth`=1, `curmana`=0 WHERE `id`=2591;
UPDATE `creature` SET `modelid`=0, `curhealth`=1, `curmana`=0 WHERE `id`=4844;
UPDATE `creature` SET `modelid`=0, `curhealth`=1 WHERE `id`=5471;
UPDATE `creature` SET `modelid`=0, `curhealth`=1 WHERE `id`=5615;
UPDATE `creature` SET `modelid`=0, `curhealth`=1, `MovementType`=0 WHERE `guid` IN (200617,200618);
UPDATE `creature` SET `modelid`=0, `curhealth`=1, `curmana`=0 WHERE `id`=14876;
UPDATE `creature` SET `MovementType`=0 WHERE `guid` IN (14564,14556,151934,151935,151936,151947,151948,151949,151995,151996,151997,151998,201735,201757,201764,28686,152002,152003,151979,151959,151940,151937,209098,209097,202337,78554,78555,200615,42880,152311,152315);
DELETE FROM `creature_addon` WHERE `guid` IN (7690,23130,23466,23467,14564,128582);
INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES
(7690,76900,1,0, ''),
(23130,231300,1,0, ''),
(23466,234660,1,0, ''),
(23467,234670,1,0, ''),
(128582,1285820,1,0, '');

View File

@@ -0,0 +1 @@
UPDATE `instance_template` SET `script`= 'instance_the_black_morass' WHERE `map`=269;

View File

@@ -0,0 +1,10 @@
-- Delete no longer used data from World Database
DELETE FROM `game_event_condition` WHERE `eventEntry` BETWEEN 33 AND 47;
DELETE FROM `game_event_creature_quest` WHERE `eventEntry` BETWEEN 33 AND 47;
DELETE FROM `game_event_npc_vendor` WHERE `eventEntry` BETWEEN 33 AND 47;
DELETE FROM `game_event_npcflag` WHERE `eventEntry` BETWEEN 33 AND 47;
DELETE FROM `game_event_prerequisite` WHERE `eventEntry` BETWEEN 33 AND 47;
DELETE FROM `game_event_quest_condition` WHERE `eventEntry` BETWEEN 33 AND 47;
DELETE FROM `game_event` WHERE `description` LIKE '%Shattered Sun Offensive:%';
UPDATE `creature_template` SET `lootid`=0 WHERE `entry`=29833;