Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 17:08:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-24 21:16:05 -06:00
parent 5fda499266 091d54ae04
commit 98b8e2eeb6
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/updates/1558_world_spell_linked_spell.sql Normal file
View File

@@ -0,0 +1,5 @@
DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = '44869' AND `spell_effect` = '-45018';
DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = '46019' AND `spell_effect` = '-45018';
INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
(44869, -45018, 1, 'Remove Arcane Buffet'),
(46019, -45018, 1, 'Remove Arcane Buffet');

1
sql/updates/CMakeLists.txt
View File

@@ -43,4 +43,5 @@ INSTALL(FILES
1484_mangos_7307_01_characters_arena_team_member.sql
1495_mangos_7312_01_world_trinity_string.sql
1497_mangos_7314_01_characters_guild_rank.sql
1558_world_spell_linked_spell.sql
DESTINATION share/trinity/sql/updates)

4
sql/world_spell_full.sql
View File

@@ -74,7 +74,9 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
(45342, 45348, 1, 'Apply Flame Touched'),
(46771, 45348, 1, 'Apply Flame Touched'),
(45271, 45347, 1, 'Apply Dark Touched'),
(45246, 45348, 1, 'Apply Flame Touched');
(45246, 45348, 1, 'Apply Flame Touched'),
(44869, -45018, 1, 'Remove Arcane Buffet'),
(46019, -45018, 1, 'Remove Arcane Buffet');
-- --------

2
src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp
View File

@@ -615,7 +615,6 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff)
if( ( target != m_creature->getVictim() ) && target->isAlive() && !(target->HasAura(AURA_SPECTRAL_EXHAUSTION, 0)) )
{
DoCast(target, SPELL_SPECTRAL_BLAST);
target->RemoveAurasDueToSpell(SPELL_ARCANE_BUFFET);
SpectralBlastTimer = 20000+(rand()%5000);
}
else
@@ -634,7 +633,6 @@ bool GOkalocegos_teleporter(Player *player, GameObject* _GO)
player->GetSession()->SendNotification(GO_FAILED);
else
player->CastSpell(player, SPELL_TELEPORT_SPECTRAL, true);
player->RemoveAurasDueToSpell(SPELL_ARCANE_BUFFET);
return true;
}