aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2011_09_11_00_world_creature_template.sql1
-rw-r--r--sql/updates/world/2011_09_11_00_world_spell_linked_spell.sql6
-rw-r--r--sql/updates/world/2011_09_11_01_world_sai.sql51
-rw-r--r--sql/updates/world/2011_09_11_02_world_creature_template.sql4
-rw-r--r--sql/updates/world/2011_09_11_03_world_gameobject.sql5
-rw-r--r--sql/updates/world/2011_09_11_04_world_spell_linked_spell.sql10
-rw-r--r--sql/updates/world/2011_09_11_05_world_misc.sql32
-rw-r--r--sql/updates/world/2011_09_11_06_world_spell_conditions.sql8
-rw-r--r--sql/updates/world/2011_09_11_07_world_sai.sql15
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.h2
-rwxr-xr-xsrc/server/game/Server/Protocol/Opcodes.cpp8
-rwxr-xr-xsrc/server/game/Server/Protocol/Opcodes.h8
-rwxr-xr-xsrc/server/game/Spells/Spell.cpp4
-rw-r--r--src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp4
14 files changed, 145 insertions, 13 deletions
diff --git a/sql/updates/world/2011_09_11_00_world_creature_template.sql b/sql/updates/world/2011_09_11_00_world_creature_template.sql
new file mode 100644
index 00000000000..a4bf485350b
--- /dev/null
+++ b/sql/updates/world/2011_09_11_00_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `unit_flags` = `unit_flags` &~1 WHERE `unit_flags` & 1; \ No newline at end of file
diff --git a/sql/updates/world/2011_09_11_00_world_spell_linked_spell.sql b/sql/updates/world/2011_09_11_00_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..93365589b44
--- /dev/null
+++ b/sql/updates/world/2011_09_11_00_world_spell_linked_spell.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (57294,57399);
+INSERT INTO `spell_linked_spell` VALUES
+(57294,59690,2,'Well Fed - Well Fed (DND)'),
+(57399,59699,2,'Well Fed - Well Fed (DND)');
+
+DELETE FROM `spell_group` WHERE `spell_id` IN (59690,59699);
diff --git a/sql/updates/world/2011_09_11_01_world_sai.sql b/sql/updates/world/2011_09_11_01_world_sai.sql
new file mode 100644
index 00000000000..453acf60dd9
--- /dev/null
+++ b/sql/updates/world/2011_09_11_01_world_sai.sql
@@ -0,0 +1,51 @@
+-- Sets SmartAI for Mechagnomes
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=25814;
+
+-- Says for Mechagnomes
+DELETE FROM `creature_text` WHERE `entry`=25814;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+(25814,1,1, 'We are Mechagnome...resistance is futile.',12,0,0,0,0,0, ''),
+(25814,1,2, 'The flesh is weak. We will make you better, stronger...faster.',12,0,0,0,0,0, ''),
+(25814,1,3, 'We can decurse you, we have the technology.',12,0,0,0,0,0, '');
+
+-- Mechagnome SAI
+-- NOTE: Mechagnome SAI required for Horde quest Souls of the Decursed
+DELETE FROM `smart_scripts` WHERE `entryorguid`=25814 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(25814,0,0,0,4,0,100,0,0,0,0,0,1,1,10000,0,0,0,0,0,0,0,0,0,0,0,0, 'Fizzcrank Mechagnome - Chance Say on Aggro'),
+(25814,0,1,0,8,0,100,0,45980,0,0,0,33,25773,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fizzcrank Mechagnome - Killcredit on spellhit - Recursive'),
+(25814,0,2,0,8,0,100,0,46485,0,0,0,33,26096,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fizzcrank Mechagnome - Killcredit on spellhit - Souls of the Decursed');
+-- (25814,0,2,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fizzcrank Mechagnome - On Re-Cursive Transmatter Injection spellhit despawn self'),
+
+-- Links item spell to spawn spell
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=45980;
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (45980,46022,0, 'Re-Cursive quest');
+
+-- Despawn Mechagnome after spellcast (Mechagnome would not despawn using SAI resulting in possibility of multiple uses of item for credit)
+DELETE FROM `spell_scripts` WHERE `id`=45980;
+INSERT INTO `spell_scripts` (`id`, `effIndex`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
+(45980,0,1,18,0,0,0,0,0,0,0);
+
+-- FOR SURVIVOR
+
+-- Sets smartAI for Fizzcrank Survivor
+UPDATE `creature_template` SET `AIName` ='SmartAI' WHERE `entry`=25773;
+
+-- Says for Fizzcrank Survivor
+DELETE FROM `creature_text` WHERE `entry`=25773;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+(25773,0,1, 'I survived and I''m flesh again!',12,0,0,0,0,0, ''),
+(25773,0,2, 'But... but... I was perfect!',12,0,0,0,0,0, ''),
+(25773,0,3, 'Where am I? Who are you? What''s that strange feeling?',12,0,0,0,0,0, ''),
+(25773,0,4, 'I''m flesh and blood again! Thank you!',12,0,0,0,0,0, '');
+
+-- Random says, Teleport spell effect & despawn
+DELETE FROM `smart_scripts` WHERE `entryorguid`=25773 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(25773,0,0,0,1,0,100,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Fizzcrank Survivor - On spawn talk'),
+(25773,0,1,0,1,0,100,1,5000,5000,5000,5000,11,41232,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fizzcrank Survivor - OOC Cast spell'),
+(25773,0,2,0,1,0,100,0,5000,5000,5000,5000,41,2000,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Fizzcrank Survivor - OOC Force despawn');
+
+-- Remove Eventai and Eventai says
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (25814,25773);
+DELETE FROM `creature_ai_texts` WHERE `entry` IN (-533,-534,-535);
diff --git a/sql/updates/world/2011_09_11_02_world_creature_template.sql b/sql/updates/world/2011_09_11_02_world_creature_template.sql
new file mode 100644
index 00000000000..1784e983832
--- /dev/null
+++ b/sql/updates/world/2011_09_11_02_world_creature_template.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_template` SET `exp`=0,`speed_run`=0.78571 WHERE `entry`=28239; -- Arcane Beam
+DELETE FROM `creature_template_addon` WHERE `entry`=28239;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(28239,0,0,1,0, '51019'); -- Arcane Beam
diff --git a/sql/updates/world/2011_09_11_03_world_gameobject.sql b/sql/updates/world/2011_09_11_03_world_gameobject.sql
new file mode 100644
index 00000000000..b72898ba8a9
--- /dev/null
+++ b/sql/updates/world/2011_09_11_03_world_gameobject.sql
@@ -0,0 +1,5 @@
+UPDATE `gameobject_template` SET `WDBVerified`=12340 WHERE `entry`=179545;
+DELETE FROM `gameobject` WHERE `id` IN (179545,179485);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(6,179545,429,1,1,116.135,638.836,-48.467,-0.785397,0,0,0,1,7200,255,1),
+(159,179485,429,1,1,558.806,550.065,-25.4008,3.14159,0,0,0,1,180,255,1);
diff --git a/sql/updates/world/2011_09_11_04_world_spell_linked_spell.sql b/sql/updates/world/2011_09_11_04_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..120378bd3e2
--- /dev/null
+++ b/sql/updates/world/2011_09_11_04_world_spell_linked_spell.sql
@@ -0,0 +1,10 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`IN (65686, 65684, 67222, 67176, 67223, 67177, 67224, 67178);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(65686, -65684, 2, 'Remove Dark Essence 10M'),
+(65684, -65686, 2, 'Remove Light Essence 10M'),
+(67222, -67176, 2, 'Remove Dark essence 10M H'),
+(67176, -67222, 2, 'Remove Light essence 10M H'),
+(67223, -67177, 2, 'Remove Dark essence 25M'),
+(67177, -67223, 2, 'Remove Light essence 25M'),
+(67224, -67178, 2, 'Remove Dark essence 25M H'),
+(67178, -67224, 2, 'Remove Light essence 25M H');
diff --git a/sql/updates/world/2011_09_11_05_world_misc.sql b/sql/updates/world/2011_09_11_05_world_misc.sql
new file mode 100644
index 00000000000..7357d9acda6
--- /dev/null
+++ b/sql/updates/world/2011_09_11_05_world_misc.sql
@@ -0,0 +1,32 @@
+-- Orgrimmar: Hidden Enemies (5727)
+SET @Gossip=21272;
+
+DELETE FROM `gossip_menu` WHERE `text_id` IN (4513,4533,4534,4535,4536);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(3701,4513), -- 1st
+(@Gossip+0,4533), -- 2nd
+(@Gossip+1,4534), -- 3rd
+(@Gossip+2,4535), -- 4th
+(@Gossip+3,4536); -- last
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (3701,@Gossip+0,@Gossip+1,@Gossip+2,@Gossip+3);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(3701,0,0, 'You may speak frankly, Neeru...' ,1,1,@Gossip+0,0,0,0,NULL),
+(@Gossip+0,0,0, 'It is good to see the Burning Blade is taking over where the Shadow Council once failed.' ,1,1,@Gossip+1,0,0,0,NULL),
+(@Gossip+1,0,0, 'So the Searing Blade is expendable?' ,1,1,@Gossip+2,0,0,0,NULL),
+(@Gossip+2,0,0, 'If there is anything you would have of me...' ,1,1,@Gossip+3,0,0,0,NULL); -- Must Link to Final Action Menu as well
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=3216; -- Neeru Fireblade
+DELETE FROM `smart_scripts` WHERE `entryorguid`=3216 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(3216, 0, 0, 0, 62, 0, 100, 0, @Gossip+2, 0, 0, 0, 15, 5727, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Neeru Fireblade - On gossip select give Hidden Enemies quest completed');
+
+UPDATE `quest_template` SET `SpecialFlags`=`SpecialFlags`|2 WHERE `entry`=5727; -- Hidden Enemies (quest completable by external event)
+-- Conditions so gossips don't show up if the player doesn't have the item
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=3701;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup` BETWEEN @Gossip+0 AND @Gossip+3;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,3701,0,0,2,14544,1,0,0,'', 'Neeru Fireblade: Quest Hidden Enemies gossip option - requires item Lieutenant''s Insignia'),
+(14,@Gossip+0,4533,0,2,14544,1,0,0, '', 'Neeru Fireblade: Quest Hidden Enemies gossip 1 - requires item Lieutenant''s Insignia'),
+(14,@Gossip+1,4534,0,2,14544,1,0,0, '', 'Neeru Fireblade: Quest Hidden Enemies gossip 2 - requires item Lieutenant''s Insignia'),
+(14,@Gossip+2,4535,0,2,14544,1,0,0, '', 'Neeru Fireblade: Quest Hidden Enemies gossip 3 - requires item Lieutenant''s Insignia'),
+(14,@Gossip+3,4536,0,2,14544,1,0,0, '', 'Neeru Fireblade: Quest Hidden Enemies gossip 4 - requires item Lieutenant''s Insignia');
diff --git a/sql/updates/world/2011_09_11_06_world_spell_conditions.sql b/sql/updates/world/2011_09_11_06_world_spell_conditions.sql
new file mode 100644
index 00000000000..a4608599452
--- /dev/null
+++ b/sql/updates/world/2011_09_11_06_world_spell_conditions.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=66512;
+INSERT INTO `spell_linked_spell` VALUES
+(66512, 66510, 0, 'Summon Deep Jormungar on Pound Drum');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=0 AND `SourceEntry`=66512;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 0, 66512, 0, 18, 0, 195308, 0, 0, '', 'Pound Drum: Target Mysterious Snow Mound'),
+(13, 0, 66512, 0, 18, 0, 195309, 0, 0, '', 'Pound Drum: Target Mysterious Snow Mound');
diff --git a/sql/updates/world/2011_09_11_07_world_sai.sql b/sql/updates/world/2011_09_11_07_world_sai.sql
new file mode 100644
index 00000000000..02a593eb9b4
--- /dev/null
+++ b/sql/updates/world/2011_09_11_07_world_sai.sql
@@ -0,0 +1,15 @@
+-- Morbent Fel SAI
+SET @ENTRY := 1200;
+SET @SPELL_SACRED_CLEANSING := 8913;
+SET @SPELL_TOUCH_OF_DEATH := 3108;
+SET @SPELL_PRESENCE_OF_DEATH := 3109;
+SET @SPELL_UNHOLY_SHIELD := 8909;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,1,0,0,0,0,11,@SPELL_UNHOLY_SHIELD,0,0,0,0,0,1,0,0,0,0,0,0,0,"Morbent Fel - Out Of Combat - Cast Unholy Shield"),
+(@ENTRY,0,1,0,8,0,100,0,@SPELL_SACRED_CLEANSING,0,0,0,36,24782,0,0,0,0,0,1,0,0,0,0,0,0,0,"Morbent Fel - On Spellhit - Update Template"),
+(@ENTRY,0,2,0,0,0,100,0,0,0,24000,24000,11,@SPELL_TOUCH_OF_DEATH,0,0,0,0,0,2,0,0,0,0,0,0,0,"Morbent Fel - In Combat - Cast Touch of Death"),
+(@ENTRY,0,3,0,0,0,100,0,0,0,3700,13300,11,@SPELL_PRESENCE_OF_DEATH,0,0,0,0,0,2,0,0,0,0,0,0,0,"Morbent Fel - In Combat - Cast Presence of Death"),
+(@ENTRY,0,4,0,2,0,100,1,0,15,0,0,28,@SPELL_UNHOLY_SHIELD,1,0,0,0,0,1,0,0,0,0,0,0,0,"Morbent Fel - At 15% HP - Remove Unholy Shield");
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 815892ed3b0..cb4bd39347b 100755
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -572,7 +572,7 @@ enum DamageEffectType
// Value masks for UNIT_FIELD_FLAGS
enum UnitFlags
{
- UNIT_FLAG_UNK_0 = 0x00000001,
+ UNIT_FLAG_SERVER_CONTROLLED = 0x00000001, // set only when unit movement is controlled by server - by SPLINE/MONSTER_MOVE packets, together with UNIT_FLAG_STUNNED; only set to units controlled by client; client function CGUnit_C::IsClientControlled returns false when set for owner
UNIT_FLAG_NON_ATTACKABLE = 0x00000002, // not attackable
UNIT_FLAG_DISABLE_MOVE = 0x00000004,
UNIT_FLAG_PVP_ATTACKABLE = 0x00000008, // allow apply pvp rules to attackable state in addition to faction dependent state
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 629df10abf7..cbaf789faf6 100755
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -1256,10 +1256,10 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
/*0x4CB*/ { "CMSG_START_BATTLEFIELD_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL },
/*0x4CC*/ { "CMSG_END_BATTLEFIELD_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL },
/*0x4CD*/ { "SMSG_MULTIPLE_PACKETS", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide },
- /*0x4CE*/ { "SMSG_FORCE_UNK1_SPEED_CHANGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide },
- /*0x4CF*/ { "CMSG_FORCE_UNK1_SPEED_CHANGE_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL },
- /*0x4D0*/ { "SMSG_FORCE_UNK2_SPEED_CHANGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide },
- /*0x4D1*/ { "CMSG_FORCE_UNK2_SPEED_CHANGE_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL },
+ /*0x4CE*/ { "SMSG_MOVE_GRAVITY_DISABLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide },
+ /*0x4CF*/ { "CMSG_MOVE_GRAVITY_DISABLE_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL },
+ /*0x4D0*/ { "SMSG_MOVE_GRAVITY_ENABLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide },
+ /*0x4D1*/ { "CMSG_MOVE_GRAVITY_ENABLE_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL },
/*0x4D2*/ { "MSG_MOVE_GRAVITY_CHNG", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide },
/*0x4D3*/ { "SMSG_SPLINE_MOVE_GRAVITY_DISABLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide },
/*0x4D4*/ { "SMSG_SPLINE_MOVE_GRAVITY_ENABLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide },
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 5f88aa3c01f..c02b52bfb5a 100755
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -1264,10 +1264,10 @@ enum Opcodes
CMSG_START_BATTLEFIELD_CHEAT = 0x4CB,
CMSG_END_BATTLEFIELD_CHEAT = 0x4CC,
SMSG_MULTIPLE_PACKETS = 0x4CD,
- SMSG_FORCE_UNK1_SPEED_CHANGE = 0x4CE,
- CMSG_FORCE_UNK1_SPEED_CHANGE_ACK = 0x4CF,
- SMSG_FORCE_UNK2_SPEED_CHANGE = 0x4D0,
- CMSG_FORCE_UNK2_SPEED_CHANGE_ACK = 0x4D1,
+ SMSG_MOVE_GRAVITY_DISABLE = 0x4CE,
+ CMSG_MOVE_GRAVITY_DISABLE_ACK = 0x4CF,
+ SMSG_MOVE_GRAVITY_ENABLE = 0x4D0,
+ CMSG_MOVE_GRAVITY_ENABLE_ACK = 0x4D1,
MSG_MOVE_GRAVITY_CHNG = 0x4D2,
SMSG_SPLINE_MOVE_GRAVITY_DISABLE = 0x4D3,
SMSG_SPLINE_MOVE_GRAVITY_ENABLE = 0x4D4,
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index d005f5b2404..198e1b7b43f 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3101,8 +3101,8 @@ void Spell::cast(bool skipCheck)
m_caster->ToPlayer()->SetSpellModTakingSpell(this, true);
}
- // triggered cast called from Spell::prepare where it was already checked
- if (!IsTriggered() || !skipCheck)
+ // skip check if done already (for instant cast spells for example)
+ if (!skipCheck)
{
SpellCastResult castResult = CheckCast(false);
if (castResult != SPELL_CAST_OK)
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
index 26b200bdbbc..3c8b62bf64a 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
@@ -978,7 +978,7 @@ class spell_xt002_submerged : public SpellScriptLoader
if (!caster)
return;
- caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_0 | UNIT_FLAG_NOT_SELECTABLE);
+ caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
caster->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_SUBMERGED);
}
@@ -1009,7 +1009,7 @@ class spell_xt002_stand : public SpellScriptLoader
if (!target)
return;
- target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_0 | UNIT_FLAG_NOT_SELECTABLE);
+ target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
target->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND);
}