diff options
| author | Spp <spp@jorge.gr> | 2013-01-16 15:29:41 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-16 15:29:41 +0100 |
| commit | 0e8011657d08c4a9f12657ccbe2f73aa56effaaa (patch) | |
| tree | 23a6f5d51b4febcd7be8acd0b49eed173640bcf2 /sql/updates | |
| parent | 9391d087fd1707ae9298e0f6ced54bf3d7f11c13 (diff) | |
| parent | 927062f61fb0c61da0e31f38e9be249f81c89d6c (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
Diffstat (limited to 'sql/updates')
| -rw-r--r-- | sql/updates/world/2013_01_15_05_world_creature_addon.sql | 1 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_15_06_world_spell_script_names.sql | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sql/updates/world/2013_01_15_05_world_creature_addon.sql b/sql/updates/world/2013_01_15_05_world_creature_addon.sql new file mode 100644 index 00000000000..94782891ca1 --- /dev/null +++ b/sql/updates/world/2013_01_15_05_world_creature_addon.sql @@ -0,0 +1 @@ +DELETE FROM `creature_addon` WHERE guid=49286; diff --git a/sql/updates/world/2013_01_15_06_world_spell_script_names.sql b/sql/updates/world/2013_01_15_06_world_spell_script_names.sql new file mode 100644 index 00000000000..0e327bdc63d --- /dev/null +++ b/sql/updates/world/2013_01_15_06_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=24314; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(24314, 'spell_threatening_gaze'); |