mmo-ref/cmangos-classic
1
0
Fork 0
mirror of https://github.com/cmangos/mangos-classic synced 2026-08-14 02:23:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict from Stave of the Ancients commit

Browse source
This commit is contained in:
killerwife 2018-03-22 08:13:58 +01:00
parent b5ba0942f2
commit dbe73246c7
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/scriptdev2/scriptdev2.sql
View file

@ -100,11 +100,7 @@ UPDATE creature_template SET ScriptName='npc_prof_leather' WHERE entry IN (7866,
-- UPDATE creature_template SET ScriptName='' WHERE npcflag!=npcflag|65536 AND ScriptName='npc_innkeeper';
-- UPDATE creature_template SET ScriptName='npc_innkeeper' WHERE npcflag=npcflag|65536;
UPDATE creature_template SET ScriptName='npc_redemption_target' WHERE entry IN (6172,6177,17542,17768);
<<<<<<< HEAD
=======
UPDATE creature_template SET ScriptName='npc_burster_worm' WHERE entry IN (16844,16857,16968,21380,21849,22038,22466,22482,23285);
UPDATE creature_template SET ScriptName='npc_the_cleaner' WHERE entry=14503;
>>>>>>> e1e796eb89... Implement q.7636 Stave of the Ancients
/* SPELL */
UPDATE creature_template SET ScriptName='spell_dummy_npc' WHERE entry IN (