diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-27 20:59:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-27 20:59:22 +0200 |
| commit | 2cba07d6a1e319fec6d763daa69af3e29ba837c4 (patch) | |
| tree | 990d4a22193c066fa9aa20a7c33b4330e9a60086 /sql | |
| parent | 55eafa247d91e24bd59a369daa05b05d20334791 (diff) | |
| parent | e502e01f5d16964e67685c956e204ae41b756d26 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
README.md
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Updates/UpdateData.h
src/server/game/Server/WorldPacket.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2014_07_27_03_world_misc.sql | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/updates/world/2014_07_27_03_world_misc.sql b/sql/updates/world/2014_07_27_03_world_misc.sql new file mode 100644 index 00000000000..6acbe68e67f --- /dev/null +++ b/sql/updates/world/2014_07_27_03_world_misc.sql @@ -0,0 +1,8 @@ +DELETE FROM `spell_area` WHERE `spell` IN(48763,48761, 45614); +INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES +(48763, 4180, 12274, 0, 0, 0, 0, 0, 74, 11), +(48761, 4180, 12274, 0, 0, 0, 1, 0, 74, 11), +(45614, 4125, 11633, 0, 0, 0, 2, 0, 74, 11), +(45614, 4135, 11633, 0, 0, 0, 2, 0, 74, 11), +(45614, 4136, 11633, 0, 0, 0, 2, 0, 74, 11), +(45614, 4137, 11633, 0, 0, 0, 2, 0, 74, 11); |