gree i hate diffs between branches

This commit is contained in:
Aokromes
2019-04-29 21:12:58 +02:00
parent 5b35dec53f
commit 9a921161f7
3 changed files with 7 additions and 7 deletions
@@ -33,8 +33,8 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=38917;
DELETE FROM `spell_area` WHERE `spell`=101311;
INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`,`quest_start_status`,`quest_end_status`) VALUES
(101311,5625,25430,25324,0,0,2,1,74,11);
INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_end`,`aura_spell`,`racemask`,`gender`,`flags`,`quest_start_status`,`quest_end_status`) VALUES
(101311,5625,25430,25324,0,0,2,3,74,11);
UPDATE `creature_template` SET `flags_extra`=2 WHERE `entry`=40139;
@@ -66,8 +66,8 @@ UPDATE `quest_template` SET `AllowableRaces`=1101 WHERE `ID` IN (25352,25268,277
UPDATE `quest_template` SET `AllowableRaces`=690 WHERE `ID` IN (25354,25269,27721,25272,25279,25277,25355,25617,25624,25612,27399);
DELETE FROM `spell_area` WHERE `spell`=74091;
INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`,`quest_start_status`,`quest_end_status`) VALUES
(74091,4979,0,25272,0,0,2,1,64,11);
INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_end`,`aura_spell`,`racemask`,`gender`,`flags`,`quest_start_status`,`quest_end_status`) VALUES
(74091,4979,0,25272,0,0,2,3,64,11);
DELETE FROM `gameobject` WHERE `guid`=237982;
@@ -1,8 +1,8 @@
-- Spell Area
DELETE FROM `spell_area` WHERE `area` IN (493, 5040) AND `spell`= 49416;
INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `autocast`, `gender`, `quest_start_status`, `quest_end_status`) VALUES
(49416, 493, 25316, 25316, 1, 2, 2, 11),
(49416, 5040, 25316, 25316, 1, 2, 2, 11);
INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `flags`, `gender`, `quest_start_status`, `quest_end_status`) VALUES
(49416, 493, 25316, 25316, 3, 2, 2, 11),
(49416, 5040, 25316, 25316, 3, 2, 2, 11);
-- Gameobject focus (203087)
DELETE FROM `gameobject` WHERE `guid`= 200888;