Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
This commit is contained in:
commit
bb9614d00d
73 files changed
+381
-374
No files matched your search
@@ -0,0 +1,4 @@
|
||||
UPDATE `creature_ai_scripts` SET `action1_param1`=`action1_param1` + 1 WHERE `action1_type`=17;
|
||||
UPDATE `creature_ai_scripts` SET `action2_param1`=`action2_param1` + 1 WHERE `action2_type`=17;
|
||||
UPDATE `creature_ai_scripts` SET `action3_param1`=`action3_param1` + 1 WHERE `action3_type`=17;
|
||||
UPDATE `creature_ai_scripts` SET `action1_param1`=25 WHERE `id`=1531201;
|
||||
Reference in new issue
Block a user