diff --git a/apps/installer/includes/os_configs/debian.sh b/apps/installer/includes/os_configs/debian.sh index 66353ecae..76b1c9463 100644 --- a/apps/installer/includes/os_configs/debian.sh +++ b/apps/installer/includes/os_configs/debian.sh @@ -3,16 +3,27 @@ if ! command -v lsb_release &>/dev/null ; then fi DEBIAN_VERSION=$(lsb_release -sr) +DEBIAN_VERSION_MIN="12" + +if [[ $DEBIAN_VERSION -lt $DEBIAN_VERSION_MIN ]]; then + echo "########## ########## ##########" + echo "" + echo " using unsupported Debian version" $DEBIAN_VERSION + echo " please update to Debian" $DEBIAN_VERSION_MIN "or later" + echo "" + echo "########## ########## ##########" +fi sudo apt-get update -y sudo apt-get install -y gdbserver gdb unzip curl \ libncurses-dev libreadline-dev clang g++ \ - gcc git cmake make ccache + gcc git cmake make ccache \ + default-libmysqlclient-dev libssl-dev libbz2-dev \ + libboost-all-dev gnupg wget -if [[ $DEBIAN_VERSION -eq "10" ]]; then - sudo apt-get install -y default-libmysqlclient-dev libssl-dev libreadline-dev libncurses-dev mariadb-server - libboost-system1.6*-dev libboost-filesystem1.6*-dev libboost-program-options1.6*-dev libboost-iostreams1.6*-dev \ -else # Debian 8 and 9 should work using this - sudo apt-get install -y libmysqlclient-dev libssl1.0-dev mysql-server -fi +# run noninteractive install for MYSQL 8.4 LTS +wget https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb +sudo DEBIAN_FRONTEND="noninteractive" dpkg -i ./mysql-apt-config_0.8.32-1_all.deb +sudo apt-get update +sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server diff --git a/data/sql/updates/db_world/2024_08_19_01.sql b/data/sql/updates/db_world/2024_08_19_01.sql new file mode 100644 index 000000000..cd941d7ba --- /dev/null +++ b/data/sql/updates/db_world/2024_08_19_01.sql @@ -0,0 +1,7 @@ +-- DB update 2024_08_19_00 -> 2024_08_19_01 +-- Fix spells timers for Hemathion (18692) +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 18692) AND (`source_type` = 0) AND (`id` IN (0, 1, 2)); +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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(18692, 0, 0, 0, 0, 0, 100, 0, 5000, 15000, 5000, 35000, 0, 0, 11, 9573, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Hemathion - In Combat - Cast Flame Breath'), +(18692, 0, 1, 0, 0, 0, 100, 0, 5000, 15000, 40000, 60000, 0, 0, 11, 14100, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Hemathion - In Combat - Cast Terrifying Roar'), +(18692, 0, 2, 0, 12, 0, 100, 1, 0, 20, 0, 0, 0, 0, 11, 38895, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Hemathion - Between 0-20% Health - Cast Devour (No Repeat)'); diff --git a/data/sql/updates/db_world/2024_08_19_02.sql b/data/sql/updates/db_world/2024_08_19_02.sql new file mode 100644 index 000000000..cbe8eedf7 --- /dev/null +++ b/data/sql/updates/db_world/2024_08_19_02.sql @@ -0,0 +1,2 @@ +-- DB update 2024_08_19_01 -> 2024_08_19_02 +UPDATE `creature_template` SET `minlevel` = 68, `maxlevel` = 80, `exp` = 0, `DamageModifier` = 1, `unit_class` = 2 WHERE `entry` = 15438; diff --git a/data/sql/updates/db_world/2024_08_20_00.sql b/data/sql/updates/db_world/2024_08_20_00.sql new file mode 100644 index 000000000..3e3d66e13 --- /dev/null +++ b/data/sql/updates/db_world/2024_08_20_00.sql @@ -0,0 +1,3 @@ +-- DB update 2024_08_19_02 -> 2024_08_20_00 +-- +DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_mother_shahraz_fatal_attraction_aura'; diff --git a/data/sql/updates/db_world/2024_08_21_00.sql b/data/sql/updates/db_world/2024_08_21_00.sql new file mode 100644 index 000000000..a4c0589e2 --- /dev/null +++ b/data/sql/updates/db_world/2024_08_21_00.sql @@ -0,0 +1,107 @@ +-- DB update 2024_08_20_00 -> 2024_08_21_00 +-- . +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=1428; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22, 1, 1428, 0, 0, 29, 0, 1433, 100, 0, 1, 0, 0, "", "Execute Rema Schneider's SAI only if Corbett Schneider is not nearby"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (1428, 1433); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1428, 1433, 143300, 143301, 143302); +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 +(1428, 0, 0, 0, 20, 0, 100, 0, 333, 0, 0, 0, 12, 1433, 8, 0, 0, 0, 0, 8, 0, 0, 0, -8773.6504, 717.4009, 99.5340, 3.8705, "Rema Schneider - On Quest Turn-in - Summon Corbett Schneider"), + +(1433, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 80, 143300, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Spawn - Run Actionlist"), +(1433, 0, 1, 0, 40, 0, 100, 0, 4, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On WP 4 Reached - Talk 1"), +(1433, 0, 2, 0, 40, 0, 100, 0, 31, 0, 0, 0, 80, 143301, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On WP 31 Reached - Run Actionlist"), +(1433, 0, 3, 0, 40, 0, 100, 0, 34, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On WP 34 Reached - Talk 4"), +(1433, 0, 4, 0, 40, 0, 100, 0, 41, 0, 0, 0, 80, 143302, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On WP 41 Reached - Run Actionlist"), +(1433, 0, 5, 0, 40, 0, 100, 0, 44, 0, 0, 0, 1, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On WP 44 Reached - Talk 8"), +(1433, 0, 6, 0, 40, 0, 100, 0, 64, 0, 0, 0, 1, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On WP 64 Reached - Talk 9"), +(1433, 0, 7, 0, 40, 0, 100, 0, 70, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On WP 70 Reached - Despawn"), + +(143300, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 1428, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 0 (Rema Schneider)"), +(143300, 9, 1, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 0"), +(143300, 9, 2, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 53, 0, 1433, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Start Waypoint"), + +(143301, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 54, 16000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Pause WP for 15 seconds"), +(143301, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 2"), +(143301, 9, 2, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 1427, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 0 (Harlan Bagley)"), +(143301, 9, 3, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 3"), + +(143302, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 54, 21000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Pause WP for 15 seconds"), +(143302, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 5"), +(143302, 9, 2, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 483, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 0 (Elaine Trias)"), +(143302, 9, 3, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 6"), +(143302, 9, 4, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Corbett Schneider - On Script - Talk 7"); + +DELETE FROM `waypoints` WHERE `entry`=1433; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(1433, 1, -8766.4648, 716.7565, 99.5340, "Corbett Schneider"), +(1433, 2, -8756.1455, 726.3924, 98.1680, "Corbett Schneider"), +(1433, 3, -8736.9951, 700.4968, 98.6993, "Corbett Schneider"), +(1433, 4, -8752.06, 687.8629, 100.4303, "Corbett Schneider"), +(1433, 5, -8762.08, 680.5356, 101.7102, "Corbett Schneider"), +(1433, 6, -8772.759, 671.8912, 103.0923, "Corbett Schneider"), +(1433, 7, -8772.768, 667.782, 103.4332, "Corbett Schneider"), +(1433, 8, -8773.276, 664.1729, 103.2741, "Corbett Schneider"), +(1433, 9, -8768.034, 657.9344, 103.6037, "Corbett Schneider"), +(1433, 10, -8761.147, 647.2188, 103.86, "Corbett Schneider"), +(1433, 11, -8759.447, 638.8893, 103.3162, "Corbett Schneider"), +(1433, 12, -8758.039, 628.078, 102.0694, "Corbett Schneider"), +(1433, 13, -8761.208, 620.6109, 99.95255, "Corbett Schneider"), +(1433, 14, -8767.146, 612.2792, 97.46174, "Corbett Schneider"), +(1433, 15, -8777.32, 603.8011, 97.09476, "Corbett Schneider"), +(1433, 16, -8793.533, 591.5438, 97.66048, "Corbett Schneider"), +(1433, 17, -8798.256, 589.9958, 97.36029, "Corbett Schneider"), +(1433, 18, -8803.463, 592.6121, 97.25187, "Corbett Schneider"), +(1433, 19, -8808.244, 598.1001, 96.85836, "Corbett Schneider"), +(1433, 20, -8813.239, 605.8572, 96.07804, "Corbett Schneider"), +(1433, 21, -8819.136, 613.8248, 95.15321, "Corbett Schneider"), +(1433, 22, -8821.637, 620.8274, 94.33056, "Corbett Schneider"), +(1433, 23, -8820.776, 625.7927, 93.82214, "Corbett Schneider"), +(1433, 24, -8816.414, 628.6717, 94.11055, "Corbett Schneider"), +(1433, 25, -8809.802, 631.7798, 94.22869, "Corbett Schneider"), +(1433, 26, -8801.114, 634.4752, 94.22869, "Corbett Schneider"), +(1433, 27, -8793.909, 634.5373, 94.32002, "Corbett Schneider"), +(1433, 28, -8788.455, 635.6047, 94.8966, "Corbett Schneider"), +(1433, 29, -8783.56, 636.822, 97.24657, "Corbett Schneider"), +(1433, 30, -8781.598, 636.8708, 97.22314, "Corbett Schneider"), +(1433, 31, -8781.735, 638.8378, 97.22314, "Corbett Schneider"), +(1433, 32, -8781.778, 636.7758, 97.22314, "Corbett Schneider"), +(1433, 33, -8795.15, 634.1953, 94.28103, "Corbett Schneider"), +(1433, 34, -8801.708, 633.1341, 94.22869, "Corbett Schneider"), +(1433, 35, -8817.858, 626.8513, 93.98212, "Corbett Schneider"), +(1433, 36, -8828.889, 622.524, 93.88631, "Corbett Schneider"), +(1433, 37, -8840.156, 612.7209, 92.8798, "Corbett Schneider"), +(1433, 38, -8847.144, 604.3766, 92.36099, "Corbett Schneider"), +(1433, 39, -8852.638, 595.577, 92.37487, "Corbett Schneider"), +(1433, 40, -8863.147, 582.9686, 93.46239, "Corbett Schneider"), +(1433, 41, -8848.96, 570.478, 96.0, "Corbett Schneider"), +(1433, 42, -8859.677, 580.5781, 94.49109, "Corbett Schneider"), +(1433, 43, -8862.987, 584.5252, 93.1463, "Corbett Schneider"), +(1433, 44, -8840.954, 607.2128, 93.16522, "Corbett Schneider"), +(1433, 45, -8837.177, 617.1418, 93.02146, "Corbett Schneider"), +(1433, 46, -8839.63, 632.0125, 94.44655, "Corbett Schneider"), +(1433, 47, -8845.286, 644.3653, 96.2437, "Corbett Schneider"), +(1433, 48, -8849.153, 651.5832, 96.53387, "Corbett Schneider"), +(1433, 49, -8851.61, 661.0834, 97.05186, "Corbett Schneider"), +(1433, 50, -8845.611, 665.9679, 97.63871, "Corbett Schneider"), +(1433, 51, -8837.404, 671.1436, 98.19347, "Corbett Schneider"), +(1433, 52, -8825.113, 679.1154, 97.53572, "Corbett Schneider"), +(1433, 53, -8830.587, 690.738, 97.36238, "Corbett Schneider"), +(1433, 54, -8841.896, 715.2056, 97.55064, "Corbett Schneider"), +(1433, 55, -8842.827, 723.2777, 97.29913, "Corbett Schneider"), +(1433, 56, -8834.735, 728.9673, 97.85699, "Corbett Schneider"), +(1433, 57, -8819.055, 738.2991, 97.92567, "Corbett Schneider"), +(1433, 58, -8803.791, 745.3076, 97.57478, "Corbett Schneider"), +(1433, 59, -8787.081, 745.6882, 98.51132, "Corbett Schneider"), +(1433, 60, -8773.176, 740.5723, 99.45663, "Corbett Schneider"), +(1433, 61, -8764.434, 735.3757, 98.88588, "Corbett Schneider"), +(1433, 62, -8758.341, 726.0469, 98.21922, "Corbett Schneider"), +(1433, 63, -8762.695, 720.631, 99.53365, "Corbett Schneider"), +(1433, 64, -8767.639, 715.3578, 99.53385, "Corbett Schneider"), +(1433, 65, -8773.21, 714.8073, 99.53385, "Corbett Schneider"), +(1433, 66, -8777.759, 715.541, 99.52771, "Corbett Schneider"), +(1433, 67, -8780.018, 717.4185, 99.53414, "Corbett Schneider"), +(1433, 68, -8776.452, 719.8099, 101.5017, "Corbett Schneider"), +(1433, 69, -8773.681, 722.051, 104.1553, "Corbett Schneider"), +(1433, 70, -8771.129, 724.3008, 105.9132, "Corbett Schneider"); diff --git a/data/sql/updates/db_world/2024_08_22_00.sql b/data/sql/updates/db_world/2024_08_22_00.sql new file mode 100644 index 000000000..395431400 --- /dev/null +++ b/data/sql/updates/db_world/2024_08_22_00.sql @@ -0,0 +1,3 @@ +-- DB update 2024_08_21_00 -> 2024_08_22_00 +-- +DELETE FROM `event_scripts` WHERE `id` = 14797; diff --git a/data/sql/updates/db_world/2024_08_22_01.sql b/data/sql/updates/db_world/2024_08_22_01.sql new file mode 100644 index 000000000..fcee084c8 --- /dev/null +++ b/data/sql/updates/db_world/2024_08_22_01.sql @@ -0,0 +1,6 @@ +-- DB update 2024_08_22_00 -> 2024_08_22_01 +-- Set RequiredNpcOrGo1 of quest 6661 Deeprun Rat Roundup to 13017 +UPDATE `quest_template` SET `RequiredNpcOrGo1`=13017 WHERE `ID`=6661; + +-- Set quest credit to unit 13017 in 'Deeprun Rat - On Spellhit - Quest Credit' +UPDATE `smart_scripts` SET `action_param1`=13017 WHERE `entryorguid`=13016 AND `source_type`=0 AND `id`=2 AND `link`=3; diff --git a/data/sql/updates/db_world/2024_08_25_00.sql b/data/sql/updates/db_world/2024_08_25_00.sql new file mode 100644 index 000000000..7e5e28aad --- /dev/null +++ b/data/sql/updates/db_world/2024_08_25_00.sql @@ -0,0 +1,13 @@ +-- DB update 2024_08_22_01 -> 2024_08_25_00 +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=23569; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23569 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=2356900 AND `source_type`=9; +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 +(23569,0,0,1,62,0,100,0,8837,0,0,0,134,42670,0,0,0,0,0,7,0,0,0,0,0,0,0,'Renn McGill - On Gossip Option 0 Selected - Invoker Cast \'Replace Repaired Diving Gear\''), +(23569,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Renn McGill - On Gossip Option 0 Selected - Close Gossip'), +(23569,0,2,0,20,0,100,0,11140,0,0,0,80,2356900,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Quest \'Recover the Cargo!\' Finished - Run Script'), +(2356900,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Remove Npc Flag Questgiver+Gossip'), +(2356900,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Say Line 0'), +(2356900,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Say Line 1'), +(2356900,9,3,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Say Line 2'), +(2356900,9,4,0,0,0,100,0,6000,6000,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Renn McGill - On Script - Add Npc Flag Questgiver+Gossip'); diff --git a/data/sql/updates/db_world/2024_08_26_00.sql b/data/sql/updates/db_world/2024_08_26_00.sql new file mode 100644 index 000000000..729905885 --- /dev/null +++ b/data/sql/updates/db_world/2024_08_26_00.sql @@ -0,0 +1,9 @@ +-- DB update 2024_08_25_00 -> 2024_08_26_00 +-- Fix the target_type for Chain lightning and Psychic Scream spells with Twilight Prophet +SET @ENTRY := 15308; +DELETE FROM `smart_scripts` WHERE (`source_type` = 0) AND (`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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@ENTRY, 0, 0, 0, 0, 0, 100, 0, 4000, 4500, 12000, 15000, 0, 0, 11, 15305, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Prophet - In Combat - Cast Chain Lightning'), +(@ENTRY, 0, 1, 0, 0, 0, 100, 0, 8000, 9000, 25000, 28000, 0, 0, 11, 22884, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Prophet - In Combat - Cast Psychic Scream'), +(@ENTRY, 0, 2, 0, 106, 0, 100, 0, 16000, 19000, 16000, 19000, 0, 8, 11, 17366, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Prophet - Within 0-8 Range - Cast Fire Nova'), +(@ENTRY, 0, 3, 0, 106, 0, 100, 0, 16000, 19000, 16000, 19000, 0, 8, 11, 15531, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Prophet - Within 0-8 Range - Cast Frost Nova'); diff --git a/data/sql/updates/db_world/2024_08_26_01.sql b/data/sql/updates/db_world/2024_08_26_01.sql new file mode 100644 index 000000000..af5f43839 --- /dev/null +++ b/data/sql/updates/db_world/2024_08_26_01.sql @@ -0,0 +1,5 @@ +-- DB update 2024_08_26_00 -> 2024_08_26_01 +-- +DELETE FROM `spell_script_names` WHERE `spell_id` = 41360; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(41360, 'spell_black_temple_l5_arcane_charge'); diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index b5ed464a2..f2761b424 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -24,4 +24,3 @@ if (BUILD_APPLICATION_WORLDSERVER) add_subdirectory(game) add_subdirectory(scripts) endif() - diff --git a/src/server/game/AI/CoreAI/GameObjectAI.cpp b/src/server/game/AI/CoreAI/GameObjectAI.cpp index ca5267331..2e0b09fa0 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.cpp +++ b/src/server/game/AI/CoreAI/GameObjectAI.cpp @@ -28,4 +28,3 @@ int32 NullGameObjectAI::Permissible(GameObject const* /*go*/) { return PERMIT_BASE_IDLE; } - diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 96a340f9c..6d1892b0f 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -33,7 +33,7 @@ int32 PetAI::Permissible(Creature const* creature) { if (creature->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) { - if (reinterpret_cast(creature)->GetOwner()->GetTypeId() == TYPEID_PLAYER) + if (reinterpret_cast(creature)->GetOwner()->IsPlayer()) return PERMIT_BASE_PROACTIVE; return PERMIT_BASE_REACTIVE; } @@ -210,7 +210,7 @@ void PetAI::UpdateAI(uint32 diff) // Autocast (casted only in combat or persistent spells in any state) if (!me->HasUnitState(UNIT_STATE_CASTING)) { - if (owner && owner->GetTypeId() == TYPEID_PLAYER && me->GetCharmInfo()->GetForcedSpell() && me->GetCharmInfo()->GetForcedTarget()) + if (owner && owner->IsPlayer() && me->GetCharmInfo()->GetForcedSpell() && me->GetCharmInfo()->GetForcedTarget()) { owner->ToPlayer()->GetSession()->HandlePetActionHelper(me, me->GetGUID(), std::abs(me->GetCharmInfo()->GetForcedSpell()), ACT_ENABLED, me->GetCharmInfo()->GetForcedTarget()); @@ -332,10 +332,10 @@ void PetAI::UpdateAI(uint32 diff) if (!me->HasInArc(M_PI, target)) { me->SetInFront(target); - if (target && target->GetTypeId() == TYPEID_PLAYER) + if (target && target->IsPlayer()) me->SendUpdateToPlayer(target->ToPlayer()); - if (owner && owner->GetTypeId() == TYPEID_PLAYER) + if (owner && owner->IsPlayer()) me->SendUpdateToPlayer(owner->ToPlayer()); } @@ -359,7 +359,7 @@ void PetAI::UpdateAllies() if (!owner) return; - else if (owner->GetTypeId() == TYPEID_PLAYER) + else if (owner->IsPlayer()) group = owner->ToPlayer()->GetGroup(); //only pet and owner/not in group->ok diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 03b105a76..c49ce38ad 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -129,7 +129,7 @@ void TotemAI::UpdateAI(uint32 /*diff*/) void TotemAI::AttackStart(Unit* /*victim*/) { // Sentry totem sends ping on attack - if (me->GetEntry() == SENTRY_TOTEM_ENTRY && me->GetOwner()->GetTypeId() == TYPEID_PLAYER) + if (me->GetEntry() == SENTRY_TOTEM_ENTRY && me->GetOwner()->IsPlayer()) { WorldPacket data(MSG_MINIMAP_PING, (8 + 4 + 4)); data << me->GetGUID(); diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index fc2508ae0..9f08ceb37 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -140,7 +140,7 @@ SpellCastResult UnitAI::DoAddAuraToAllHostilePlayers(uint32 spellid) { if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) { - if (unit->GetTypeId() == TYPEID_PLAYER) + if (unit->IsPlayer()) { me->AddAura(spellid, unit); return SPELL_CAST_OK; @@ -163,7 +163,7 @@ SpellCastResult UnitAI::DoCastToAllHostilePlayers(uint32 spellid, bool triggered { if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) { - if (unit->GetTypeId() == TYPEID_PLAYER) + if (unit->IsPlayer()) return me->CastSpell(unit, spellid, triggered); } else diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index cab036c52..39eeed124 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -668,7 +668,7 @@ void BossAI::TeleportCheaters() ThreatContainer::StorageType threatList = me->GetThreatMgr().GetThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) if (Unit* target = (*itr)->getTarget()) - if (target->GetTypeId() == TYPEID_PLAYER && !IsInBoundary(target)) + if (target->IsPlayer() && !IsInBoundary(target)) target->NearTeleportTo(x, y, z, 0); } diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index f6ed31486..cc9c116f4 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -334,6 +334,7 @@ struct ScriptedAI : public CreatureAI //Teleports a player without dropping threat (only teleports to same map) void DoTeleportPlayer(Unit* unit, float x, float y, float z, float o); + void DoTeleportPlayer(Unit* unit, Position pos) { DoTeleportPlayer(unit, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()); }; void DoTeleportAll(float x, float y, float z, float o); //Returns friendly unit with the most amount of hp missing from max hp diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index b38464bc0..aa64e7c0a 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -202,7 +202,7 @@ void SmartAI::StartPath(bool run, uint32 path, bool repeat, Unit* invoker) mCanRepeatPath = repeat; SetRun(run); - if (invoker && invoker->GetTypeId() == TYPEID_PLAYER) + if (invoker && invoker->IsPlayer()) { mEscortNPCFlags = me->GetNpcFlags(); me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index c680cc4cc..e44c03d47 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -5220,12 +5220,12 @@ WorldObject* SmartScript::GetLastInvoker(WorldObject* invoker) const bool SmartScript::IsUnit(WorldObject* obj) { - return obj && (obj->GetTypeId() == TYPEID_UNIT || obj->GetTypeId() == TYPEID_PLAYER); + return obj && (obj->GetTypeId() == TYPEID_UNIT || obj->IsPlayer()); } bool SmartScript::IsPlayer(WorldObject* obj) { - return obj && obj->GetTypeId() == TYPEID_PLAYER; + return obj && obj->IsPlayer(); } bool SmartScript::IsCreature(WorldObject* obj) diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index ce81b448b..7052f3275 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -720,9 +720,9 @@ void BattlefieldWG::HandleKill(Player* killer, Unit* victim) TeamId killerTeam = killer->GetTeamId(); // xinef: tower cannons also grant rank - if (victim->GetTypeId() == TYPEID_PLAYER || IsKeepNpc(victim->GetEntry()) || victim->GetEntry() == NPC_WINTERGRASP_TOWER_CANNON) + if (victim->IsPlayer() || IsKeepNpc(victim->GetEntry()) || victim->GetEntry() == NPC_WINTERGRASP_TOWER_CANNON) { - if (victim->GetTypeId() == TYPEID_PLAYER && victim->HasAura(SPELL_LIEUTENANT)) + if (victim->IsPlayer() && victim->HasAura(SPELL_LIEUTENANT)) { // Quest - Wintergrasp - PvP Kill - Horde/Alliance for (auto& playerGuid : m_PlayersInWar[killerTeam]) @@ -749,7 +749,7 @@ void BattlefieldWG::HandleKill(Player* killer, Unit* victim) } // Xinef: Allow to Skin non-released corpse - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { victim->SetUnitFlag(UNIT_FLAG_SKINNABLE); } diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 87a09f993..a68c8c643 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -438,13 +438,19 @@ inline void Battleground::_ProcessProgress(uint32 diff) if (newtime > (MINUTE * IN_MILLISECONDS)) { if (newtime / (MINUTE * IN_MILLISECONDS) != m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS)) - PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, nullptr, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS))); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS))); + }); } else { //announce every 15 seconds if (newtime / (15 * IN_MILLISECONDS) != m_PrematureCountDownTimer / (15 * IN_MILLISECONDS)) - PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, nullptr, (uint32)(m_PrematureCountDownTimer / IN_MILLISECONDS)); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, (uint32)(m_PrematureCountDownTimer / IN_MILLISECONDS)); + }); } m_PrematureCountDownTimer = newtime; } @@ -917,46 +923,34 @@ void Battleground::EndBattleground(PvPTeamId winnerTeamId) } if (IsEventActive(EVENT_SPIRIT_OF_COMPETITION) && isBattleground()) - SpiritofCompetitionEvent(winnerTeamId); + SpiritOfCompetitionEvent(winnerTeamId); sScriptMgr->OnBattlegroundEnd(this, GetTeamId(winnerTeamId)); } -bool Battleground::SpiritofCompetitionEvent(PvPTeamId winnerTeamId) +void Battleground::SpiritOfCompetitionEvent(PvPTeamId winnerTeamId) const { - // Everyone is eligible for tabard reward - for (BattlegroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) - { - Player* player = itr->second; - bool questStatus = player->GetQuestStatus(QUEST_FLAG_PARTICIPANT) != QUEST_STATUS_REWARDED; - - if (player && questStatus) - player->CastSpell(player, SPELL_SPIRIT_OF_COMPETITION_PARTICIPANT, true); - } - - // In case of a draw nobody get rewarded - if (winnerTeamId == PVP_TEAM_NEUTRAL) - return false; + bool isDraw = winnerTeamId == PVP_TEAM_NEUTRAL; std::vector filteredPlayers; + GetBgMap()->DoForAllPlayers([&](Player* player) + { + // Reward all eligible players the participant reward + if (player->GetQuestStatus(QUEST_FLAG_PARTICIPANT) != QUEST_STATUS_REWARDED) + player->CastSpell(player, SPELL_SPIRIT_OF_COMPETITION_PARTICIPANT, true); - for (BattlegroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + // Collect players of the winning team who has yet to recieve the winner reward + if (!isDraw && player->GetBgTeamId() == GetTeamId(winnerTeamId) && + player->GetQuestStatus(QUEST_FLAG_WINNER) != QUEST_STATUS_REWARDED) + filteredPlayers.push_back(player); + }); + + // Randomly select one player from winners team to recieve the reward, if any eligible + if (!filteredPlayers.empty()) { - Player* player = itr->second; - bool playerTeam = player->GetBgTeamId() == GetTeamId(winnerTeamId); - bool questStatus = player->GetQuestStatus(QUEST_FLAG_WINNER) != QUEST_STATUS_REWARDED; - - if (player && playerTeam && questStatus) - filteredPlayers.push_back(player); + Player* wPlayer = filteredPlayers[rand() % filteredPlayers.size()]; + wPlayer->CastSpell(wPlayer, SPELL_SPIRIT_OF_COMPETITION_WINNER, true); } - - if (filteredPlayers.size()) - { - if (Player* wPlayer = filteredPlayers[rand() % filteredPlayers.size()]) - wPlayer->CastSpell(wPlayer, SPELL_SPIRIT_OF_COMPETITION_WINNER, true); - } - - return true; } uint32 Battleground::GetBonusHonorFromKill(uint32 kills) const @@ -1654,63 +1648,6 @@ bool Battleground::AddSpiritGuide(uint32 type, float x, float y, float z, float return false; } -void Battleground::SendMessageToAll(uint32 entry, ChatMsg type, Player const* source) -{ - if (!entry) - return; - - Acore::BattlegroundChatBuilder bg_builder(type, entry, source); - Acore::LocalizedPacketDo bg_do(bg_builder); - BroadcastWorker(bg_do); -} - -void Battleground::PSendMessageToAll(uint32 entry, ChatMsg type, Player const* source, ...) -{ - if (!entry) - return; - - va_list ap; - va_start(ap, source); - - Acore::BattlegroundChatBuilder bg_builder(type, entry, source, &ap); - Acore::LocalizedPacketDo bg_do(bg_builder); - BroadcastWorker(bg_do); - - va_end(ap); -} - -void Battleground::SendWarningToAll(uint32 entry, ...) -{ - if (!entry) - return; - - std::map localizedPackets; - for (BattlegroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) - { - if (localizedPackets.find(itr->second->GetSession()->GetSessionDbLocaleIndex()) == localizedPackets.end()) - { - char const* format = sObjectMgr->GetAcoreString(entry, itr->second->GetSession()->GetSessionDbLocaleIndex()); - - char str[1024]; - va_list ap; - va_start(ap, entry); - vsnprintf(str, 1024, format, ap); - va_end(ap); - - ChatHandler::BuildChatPacket(localizedPackets[itr->second->GetSession()->GetSessionDbLocaleIndex()], CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, nullptr, nullptr, str); - } - - itr->second->SendDirectMessage(&localizedPackets[itr->second->GetSession()->GetSessionDbLocaleIndex()]); - } -} - -void Battleground::SendMessage2ToAll(uint32 entry, ChatMsg type, Player const* source, uint32 arg1, uint32 arg2) -{ - Acore::Battleground2ChatBuilder bg_builder(type, entry, source, arg1, arg2); - Acore::LocalizedPacketDo bg_do(bg_builder); - BroadcastWorker(bg_do); -} - void Battleground::EndNow() { RemoveFromBGFreeSlotQueue(); diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index fc89f58ce..709a047cc 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -344,7 +344,7 @@ public: [[nodiscard]] uint32 GetBonusHonorFromKill(uint32 kills) const; // Spirit of Competition event - bool SpiritofCompetitionEvent(PvPTeamId winnerTeamId); + void SpiritOfCompetitionEvent(PvPTeamId winnerTeamId) const; bool IsRandom() { return m_IsRandom; } @@ -471,13 +471,6 @@ public: void BlockMovement(Player* player); - void SendWarningToAll(uint32 entry, ...); - void SendMessageToAll(uint32 entry, ChatMsg type, Player const* source = nullptr); - void PSendMessageToAll(uint32 entry, ChatMsg type, Player const* source, ...); - - // specialized version with 2 string id args - void SendMessage2ToAll(uint32 entry, ChatMsg type, Player const* source, uint32 strId1 = 0, uint32 strId2 = 0); - // Raid Group [[nodiscard]] Group* GetBgRaid(TeamId teamId) const { return m_BgRaids[teamId]; } void SetBgRaid(TeamId teamId, Group* bg_raid); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index ee160c6e8..83c320fc1 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -16,6 +16,7 @@ */ #include "BattlegroundSA.h" +#include "Chat.h" #include "GameGraveyard.h" #include "GameObject.h" #include "GameTime.h" @@ -357,7 +358,11 @@ void BattlegroundSA::PostUpdateImpl(uint32 diff) if (TotalTime >= 1min) { - SendWarningToAll(LANG_BG_SA_HAS_BEGUN); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_HAS_BEGUN); + }); + TotalTime = 0s; ToggleTimer(); DemolisherStartState(false); @@ -411,7 +416,12 @@ void BattlegroundSA::PostUpdateImpl(uint32 diff) Status = BG_SA_SECOND_WARMUP; TotalTime = 0s; ToggleTimer(); - SendWarningToAll(LANG_BG_SA_ROUND_ONE_END); + + GetBgMap()->DoForAllPlayers([&](Player* player) + { + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_ROUND_ONE_END); + }); + UpdateWaitTimer = 5000; SignaledRoundTwo = false; SignaledRoundTwoHalfMin = false; @@ -617,10 +627,13 @@ void BattlegroundSA::EventPlayerDamagedGO(Player* /*player*/, GameObject* go, ui if (eventType == go->GetGOInfo()->building.destroyedEvent) { - if (go->GetGOInfo()->building.destroyedEvent == 19837) - SendWarningToAll(LANG_BG_SA_CHAMBER_BREACHED); - else - SendWarningToAll(LANG_BG_SA_WAS_DESTROYED, go->GetGOInfo()->name.c_str()); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + if (go->GetGOInfo()->building.destroyedEvent == 19837) + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_CHAMBER_BREACHED); + else + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_WAS_DESTROYED, go->GetGOInfo()->name); + }); uint32 i = GetGateIDFromEntry(go->GetEntry()); switch (i) @@ -655,7 +668,10 @@ void BattlegroundSA::EventPlayerDamagedGO(Player* /*player*/, GameObject* go, ui } if (eventType == go->GetGOInfo()->building.damageEvent) - SendWarningToAll(LANG_BG_SA_IS_UNDER_ATTACK, go->GetGOInfo()->name.c_str()); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_IS_UNDER_ATTACK, go->GetGOInfo()->name); + }); } void BattlegroundSA::HandleKillUnit(Creature* creature, Player* killer) @@ -957,10 +973,13 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source) UpdateWorldState(BG_SA_LEFT_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 1 : 0)); UpdateWorldState(BG_SA_LEFT_GY_HORDE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 0 : 1)); - if (Source->GetTeamId() == TEAM_ALLIANCE) - SendWarningToAll(LANG_BG_SA_A_GY_WEST); - else - SendWarningToAll(LANG_BG_SA_H_GY_WEST); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + if (player->GetTeamId() == TEAM_ALLIANCE) + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_A_GY_WEST); + else + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_H_GY_WEST); + }); break; case BG_SA_RIGHT_CAPTURABLE_GY: flag = BG_SA_RIGHT_FLAG; @@ -985,10 +1004,13 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source) UpdateWorldState(BG_SA_RIGHT_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 1 : 0)); UpdateWorldState(BG_SA_RIGHT_GY_HORDE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 0 : 1)); - if (Source->GetTeamId() == TEAM_ALLIANCE) - SendWarningToAll(LANG_BG_SA_A_GY_EAST); - else - SendWarningToAll(LANG_BG_SA_H_GY_EAST); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + if (player->GetTeamId() == TEAM_ALLIANCE) + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_A_GY_EAST); + else + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_H_GY_EAST); + }); break; case BG_SA_CENTRAL_CAPTURABLE_GY: flag = BG_SA_CENTRAL_FLAG; @@ -999,10 +1021,13 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source) UpdateWorldState(BG_SA_CENTER_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 1 : 0)); UpdateWorldState(BG_SA_CENTER_GY_HORDE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 0 : 1)); - if (Source->GetTeamId() == TEAM_ALLIANCE) - SendWarningToAll(LANG_BG_SA_A_GY_SOUTH); - else - SendWarningToAll(LANG_BG_SA_H_GY_SOUTH); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + if (player->GetTeamId() == TEAM_ALLIANCE) + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_A_GY_SOUTH); + else + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_A_GY_SOUTH); + }); break; default: ABORT(); @@ -1016,9 +1041,16 @@ void BattlegroundSA::EventPlayerUsedGO(Player* Source, GameObject* object) { if (Source->GetTeamId() == Attackers) { - if (Source->GetTeamId() == TEAM_ALLIANCE) - SendMessageToAll(LANG_BG_SA_ALLIANCE_CAPTURED_RELIC, CHAT_MSG_BG_SYSTEM_NEUTRAL); - else SendMessageToAll(LANG_BG_SA_HORDE_CAPTURED_RELIC, CHAT_MSG_BG_SYSTEM_NEUTRAL); + GetBgMap()->DoForAllPlayers([&](Player* player) + { + if (player->GetTeamId() == Attackers) + { + if (player->GetTeamId() == TEAM_ALLIANCE) + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_ALLIANCE_CAPTURED_RELIC); + else + ChatHandler(player->GetSession()).PSendSysMessage(LANG_BG_SA_HORDE_CAPTURED_RELIC); + } + }); if (Status == BG_SA_ROUND_ONE) { diff --git a/src/server/game/Combat/ThreatMgr.cpp b/src/server/game/Combat/ThreatMgr.cpp index 21b3741d8..92ca0c049 100644 --- a/src/server/game/Combat/ThreatMgr.cpp +++ b/src/server/game/Combat/ThreatMgr.cpp @@ -66,7 +66,7 @@ bool ThreatCalcHelper::isValidProcess(Unit* hatedUnit, Unit* hatingUnit, SpellIn return false; // not to GM - if (hatedUnit->GetTypeId() == TYPEID_PLAYER && hatedUnit->ToPlayer()->IsGameMaster()) + if (hatedUnit->IsPlayer() && hatedUnit->ToPlayer()->IsGameMaster()) return false; // not to dead and not for dead @@ -498,7 +498,7 @@ void ThreatMgr::_addThreat(Unit* victim, float threat) HostileReference* hostileRef = new HostileReference(victim, this, 0); iThreatContainer.addReference(hostileRef); hostileRef->AddThreat(threat); // now we add the real threat - if (victim->GetTypeId() == TYPEID_PLAYER && victim->ToPlayer()->IsGameMaster()) + if (victim->IsPlayer() && victim->ToPlayer()->IsGameMaster()) hostileRef->setOnlineOfflineState(false); // GM is always offline } } diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index b26272e32..5385612ff 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -325,7 +325,7 @@ namespace DisableMgr uint8 spellFlags = itr->second.flags; if (unit) { - if ((spellFlags & SPELL_DISABLE_PLAYER && unit->GetTypeId() == TYPEID_PLAYER) || + if ((spellFlags & SPELL_DISABLE_PLAYER && unit->IsPlayer()) || (unit->GetTypeId() == TYPEID_UNIT && ((unit->IsPet() && spellFlags & SPELL_DISABLE_PET) || spellFlags & SPELL_DISABLE_CREATURE))) { if (spellFlags & SPELL_DISABLE_MAP) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 043fbdd77..f51d381e4 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1906,13 +1906,13 @@ bool Creature::CanStartAttack(Unit const* who) const // This set of checks is should be done only for creatures if ((IsImmuneToNPC() && who->GetTypeId() != TYPEID_PLAYER) || // flag is valid only for non player characters - (IsImmuneToPC() && who->GetTypeId() == TYPEID_PLAYER)) // immune to PC and target is a player, return false + (IsImmuneToPC() && who->IsPlayer())) // immune to PC and target is a player, return false { return false; } if (Unit* owner = who->GetOwner()) - if (owner->GetTypeId() == TYPEID_PLAYER && IsImmuneToPC()) // immune to PC and target has player owner + if (owner->IsPlayer() && IsImmuneToPC()) // immune to PC and target has player owner return false; // Do not attack non-combat pets diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 673eedc92..b080b772e 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -218,11 +218,11 @@ void TempSummon::InitStats(uint32 duration) { SetFaction(owner->GetFaction()); SetLevel(owner->GetLevel()); - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) m_ControlledByPlayer = true; } - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) m_CreatedByPlayer = true; } @@ -397,7 +397,7 @@ void Minion::setDeathState(DeathState s, bool despawn) Creature::setDeathState(s, despawn); if (s == DeathState::JustDied && IsGuardianPet()) if (Unit* owner = GetOwner()) - if (owner->GetTypeId() == TYPEID_PLAYER && owner->GetMinionGUID() == GetGUID()) + if (owner->IsPlayer() && owner->GetMinionGUID() == GetGUID()) for (Unit::ControlSet::const_iterator itr = owner->m_Controlled.begin(); itr != owner->m_Controlled.end(); ++itr) if ((*itr)->IsAlive() && (*itr)->GetEntry() == GetEntry()) { @@ -434,7 +434,7 @@ void Guardian::InitStats(uint32 duration) { InitStatsForLevel(m_owner->GetLevel()); - if (m_owner->GetTypeId() == TYPEID_PLAYER && HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) + if (m_owner->IsPlayer() && HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) m_charmInfo->InitCharmCreateSpells(); } @@ -447,7 +447,7 @@ void Guardian::InitSummon() if (Unit* m_owner = GetOwner()) { - if (m_owner->GetTypeId() == TYPEID_PLAYER && m_owner->GetMinionGUID() == GetGUID() && !m_owner->GetCharmGUID()) + if (m_owner->IsPlayer() && m_owner->GetMinionGUID() == GetGUID() && !m_owner->GetCharmGUID()) { m_owner->ToPlayer()->CharmSpellInitialize(); } diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 7008ce476..3259ec0e1 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -510,7 +510,7 @@ void GameObject::Update(uint32 diff) { // splash bobber (bobber ready now) Unit* caster = GetOwner(); - if (caster && caster->GetTypeId() == TYPEID_PLAYER) + if (caster && caster->IsPlayer()) { SetGoState(GO_STATE_ACTIVE); ReplaceAllGameObjectFlags(GO_FLAG_NODESPAWN); @@ -634,7 +634,7 @@ void GameObject::Update(uint32 diff) case GAMEOBJECT_TYPE_FISHINGNODE: // can't fish now { Unit* caster = GetOwner(); - if (caster && caster->GetTypeId() == TYPEID_PLAYER) + if (caster && caster->IsPlayer()) { caster->ToPlayer()->RemoveGameObject(this, false); @@ -1635,7 +1635,7 @@ void GameObject::Use(Unit* user) if (HasGameObjectFlag(GO_FLAG_IN_USE)) return; - if (user->GetTypeId() == TYPEID_PLAYER) + if (user->IsPlayer()) { Player* player = user->ToPlayer(); diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index e6b60ffca..d494cd8da 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -90,7 +90,7 @@ WorldObject::~WorldObject() // this may happen because there are many !create/delete if (IsWorldObject() && m_currMap) { - if (GetTypeId() == TYPEID_CORPSE) + if (IsCorpse()) { LOG_FATAL("entities.object", "Object::~Object Corpse {}, type={} deleted but still in map!!", GetGUID().ToString(), ((Corpse*)this)->GetType()); ABORT(); @@ -403,7 +403,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const *data << object->GetOrientation(); - if (GetTypeId() == TYPEID_CORPSE) + if (IsCorpse()) *data << float(object->GetOrientation()); else *data << float(0); @@ -1087,7 +1087,7 @@ void WorldObject::setActive(bool on) if (m_isActive == on) return; - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) return; m_isActive = on; @@ -1103,7 +1103,7 @@ void WorldObject::setActive(bool on) { if (GetTypeId() == TYPEID_UNIT) map->AddToActive(this->ToCreature()); - else if (GetTypeId() == TYPEID_DYNAMICOBJECT) + else if (IsDynamicObject()) map->AddToActive((DynamicObject*)this); else if (GetTypeId() == TYPEID_GAMEOBJECT) map->AddToActive((GameObject*)this); @@ -1112,7 +1112,7 @@ void WorldObject::setActive(bool on) { if (GetTypeId() == TYPEID_UNIT) map->RemoveFromActive(this->ToCreature()); - else if (GetTypeId() == TYPEID_DYNAMICOBJECT) + else if (IsDynamicObject()) map->RemoveFromActive((DynamicObject*)this); else if (GetTypeId() == TYPEID_GAMEOBJECT) map->RemoveFromActive((GameObject*)this); @@ -1122,7 +1122,7 @@ void WorldObject::setActive(bool on) void WorldObject::SetVisibilityDistanceOverride(VisibilityDistanceType type) { ASSERT(type < VisibilityDistanceType::Max); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { return; } @@ -1329,7 +1329,7 @@ bool WorldObject::IsWithinLOS(float ox, float oy, float oz, VMAP::ModelIgnoreFla { oz += GetCollisionHeight(); float x, y, z; - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { GetPosition(x, y, z); z += GetCollisionHeight(); @@ -1350,7 +1350,7 @@ bool WorldObject::IsWithinLOSInMap(WorldObject const* obj, VMAP::ModelIgnoreFlag return false; float ox, oy, oz; - if (obj->GetTypeId() == TYPEID_PLAYER) + if (obj->IsPlayer()) { obj->GetPosition(ox, oy, oz); oz += obj->GetCollisionHeight(); @@ -1359,7 +1359,7 @@ bool WorldObject::IsWithinLOSInMap(WorldObject const* obj, VMAP::ModelIgnoreFlag obj->GetHitSpherePointFor({ GetPositionX(), GetPositionY(), GetPositionZ() + (collisionHeight ? *collisionHeight : GetCollisionHeight()) }, ox, oy, oz); float x, y, z; - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { GetPosition(x, y, z); z += GetCollisionHeight(); @@ -1634,7 +1634,7 @@ float WorldObject::GetGridActivationRange() const { return ToCreature()->m_SightDistance; } - else if (((GetTypeId() == TYPEID_GAMEOBJECT && ToGameObject()->IsTransport()) || GetTypeId() == TYPEID_DYNAMICOBJECT) && isActiveObject()) + else if (((GetTypeId() == TYPEID_GAMEOBJECT && ToGameObject()->IsTransport()) || IsDynamicObject()) && isActiveObject()) { return GetMap()->GetVisibilityRange(); } @@ -1762,7 +1762,7 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo } // pussywizard: arena spectator - if (obj->GetTypeId() == TYPEID_PLAYER) + if (obj->IsPlayer()) if (((Player const*)obj)->IsSpectator() && ((Player const*)obj)->FindMap()->IsBattleArena()) return false; @@ -1858,7 +1858,7 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo return false; // pussywizard: arena spectator - if (this->GetTypeId() == TYPEID_PLAYER) + if (this->IsPlayer()) if (((Player const*)this)->IsSpectator() && ((Player const*)this)->FindMap()->IsBattleArena() && (obj->m_invisibility.GetFlags() || obj->m_stealth.GetFlags())) return false; @@ -2035,7 +2035,7 @@ bool WorldObject::CanDetectStealthOf(WorldObject const* obj, bool checkAlert) co Unit const* unit = ToUnit(); // If this unit is an NPC then player detect range doesn't apply - if (unit && unit->GetTypeId() == TYPEID_PLAYER && visibilityRange > MAX_PLAYER_STEALTH_DETECT_RANGE) + if (unit && unit->IsPlayer() && visibilityRange > MAX_PLAYER_STEALTH_DETECT_RANGE) visibilityRange = MAX_PLAYER_STEALTH_DETECT_RANGE; if (checkAlert) @@ -2058,7 +2058,7 @@ void WorldObject::SendPlayMusic(uint32 Music, bool OnlySelf) { WorldPacket data(SMSG_PLAY_MUSIC, 4); data << Music; - if (OnlySelf && GetTypeId() == TYPEID_PLAYER) + if (OnlySelf && IsPlayer()) this->ToPlayer()->GetSession()->SendPacket(&data); else SendMessageToSet(&data, true); // ToSelf ignored in this case @@ -2389,7 +2389,7 @@ GameObject* WorldObject::SummonGameObject(uint32 entry, float x, float y, float if (respawnTime) go->SetSpellId(1); - if (GetTypeId() == TYPEID_PLAYER || (GetTypeId() == TYPEID_UNIT && summonType == GO_SUMMON_TIMED_OR_CORPSE_DESPAWN)) //not sure how to handle this + if (IsPlayer() || (GetTypeId() == TYPEID_UNIT && summonType == GO_SUMMON_TIMED_OR_CORPSE_DESPAWN)) //not sure how to handle this ToUnit()->AddGameObject(go); else go->SetSpawnedByDefault(false); @@ -2406,7 +2406,7 @@ Creature* WorldObject::SummonTrigger(float x, float y, float z, float ang, uint3 return nullptr; //summon->SetName(GetName()); - if (setLevel && (GetTypeId() == TYPEID_PLAYER || GetTypeId() == TYPEID_UNIT)) + if (setLevel && (IsPlayer() || GetTypeId() == TYPEID_UNIT)) { summon->SetFaction(((Unit*)this)->GetFaction()); summon->SetLevel(((Unit*)this)->GetLevel()); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 3147c41ab..6b439663c 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -195,21 +195,28 @@ public: void ForceValuesUpdateAtIndex(uint32); [[nodiscard]] inline bool IsPlayer() const { return GetTypeId() == TYPEID_PLAYER; } - Player* ToPlayer() { if (GetTypeId() == TYPEID_PLAYER) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] Player const* ToPlayer() const { if (GetTypeId() == TYPEID_PLAYER) return (Player const*)((Player*)this); else return nullptr; } + Player* ToPlayer() { if (IsPlayer()) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] Player const* ToPlayer() const { if (IsPlayer()) return reinterpret_cast(this); else return nullptr; } + Creature* ToCreature() { if (GetTypeId() == TYPEID_UNIT) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] Creature const* ToCreature() const { if (GetTypeId() == TYPEID_UNIT) return (Creature const*)((Creature*)this); else return nullptr; } + [[nodiscard]] Creature const* ToCreature() const { if (GetTypeId() == TYPEID_UNIT) return reinterpret_cast(this); else return nullptr; } - Unit* ToUnit() { if (GetTypeId() == TYPEID_UNIT || GetTypeId() == TYPEID_PLAYER) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] Unit const* ToUnit() const { if (GetTypeId() == TYPEID_UNIT || GetTypeId() == TYPEID_PLAYER) return (Unit const*)((Unit*)this); else return nullptr; } - GameObject* ToGameObject() { if (GetTypeId() == TYPEID_GAMEOBJECT) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] GameObject const* ToGameObject() const { if (GetTypeId() == TYPEID_GAMEOBJECT) return (GameObject const*)((GameObject*)this); else return nullptr; } + Unit* ToUnit() { if (GetTypeId() == TYPEID_UNIT || IsPlayer()) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] Unit const* ToUnit() const { if (GetTypeId() == TYPEID_UNIT || IsPlayer()) return reinterpret_cast(this); else return nullptr; } - Corpse* ToCorpse() { if (GetTypeId() == TYPEID_CORPSE) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] Corpse const* ToCorpse() const { if (GetTypeId() == TYPEID_CORPSE) return (const Corpse*)((Corpse*)this); else return nullptr; } + [[nodiscard]] inline bool IsGameObject() const { return GetTypeId() == TYPEID_GAMEOBJECT; } + GameObject* ToGameObject() { if (IsGameObject()) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] GameObject const* ToGameObject() const { if (IsGameObject()) return reinterpret_cast(this); else return nullptr; } - DynamicObject* ToDynObject() { if (GetTypeId() == TYPEID_DYNAMICOBJECT) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] DynamicObject const* ToDynObject() const { if (GetTypeId() == TYPEID_DYNAMICOBJECT) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] inline bool IsCorpse() const { return GetTypeId() == TYPEID_CORPSE; } + Corpse* ToCorpse() { if (IsCorpse()) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] Corpse const* ToCorpse() const { if (IsCorpse()) return reinterpret_cast(this); else return nullptr; } + + [[nodiscard]] inline bool IsDynamicObject() const { return GetTypeId() == TYPEID_DYNAMICOBJECT; } + DynamicObject* ToDynObject() { if (IsDynamicObject()) return reinterpret_cast(this); else return nullptr; } + [[nodiscard]] DynamicObject const* ToDynObject() const { if (IsDynamicObject()) return reinterpret_cast(this); else return nullptr; } + + [[nodiscard]] inline bool IsItem() const { return GetTypeId() == TYPEID_ITEM; } virtual std::string GetDebugInfo() const; diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 117b8f6a5..f3228f3cd 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -52,7 +52,7 @@ Pet::Pet(Player* owner, PetType type) : Guardian(nullptr, owner ? owner->GetGUID m_tempspellIsPositive(false), m_tempspell(0) { - ASSERT(m_owner && m_owner->GetTypeId() == TYPEID_PLAYER); + ASSERT(m_owner && m_owner->IsPlayer()); m_unitTypeMask |= UNIT_MASK_PET; @@ -415,7 +415,7 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c map->AddToMap(ToCreature(), true); //set last used pet number (for use in BG's) - if (owner->GetTypeId() == TYPEID_PLAYER && isControlled() && !isTemporarySummoned() && (getPetType() == SUMMON_PET || getPetType() == HUNTER_PET)) + if (owner->IsPlayer() && isControlled() && !isTemporarySummoned() && (getPetType() == SUMMON_PET || getPetType() == HUNTER_PET)) owner->ToPlayer()->SetLastPetNumber(petInfo->PetNumber); owner->GetSession()->AddQueryHolderCallback(CharacterDatabase.DelayQueryHolder(std::make_shared(ownerid, petInfo->PetNumber))) @@ -754,17 +754,12 @@ void Pet::Update(uint32 diff) GetMotionMaster()->Clear(false); GetMotionMaster()->MoveIdle(); - bool oldCmdAttack = GetCharmInfo()->IsCommandAttack(); - - GetCharmInfo()->SetIsCommandAttack(false); GetCharmInfo()->SetIsAtStay(true); GetCharmInfo()->SetIsCommandFollow(false); GetCharmInfo()->SetIsFollowing(false); GetCharmInfo()->SetIsReturning(false); GetCharmInfo()->SaveStayPosition(true); - GetCharmInfo()->SetIsCommandAttack(oldCmdAttack); - AddSpellCooldown(tempspell, 0, spellInfo->IsCooldownStartedOnEvent() ? infinityCooldownDelay : 0); CastSpell(tempspellTarget, tempspell, false); @@ -1040,7 +1035,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) //Determine pet type PetType petType = MAX_PET_TYPE; - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) { sScriptMgr->OnBeforeGuardianInitStatsForLevel(owner->ToPlayer(), this, cinfo, petType); @@ -1137,8 +1132,8 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) // remove elite bonuses included in DB values CreatureBaseStats const* stats = sObjectMgr->GetCreatureBaseStats(petlevel, cinfo->unit_class); // xinef: multiply base values by creature_template factors! - float factorHealth = owner->GetTypeId() == TYPEID_PLAYER ? std::min(1.0f, cinfo->ModHealth) : cinfo->ModHealth; - float factorMana = owner->GetTypeId() == TYPEID_PLAYER ? std::min(1.0f, cinfo->ModMana) : cinfo->ModMana; + float factorHealth = owner->IsPlayer() ? std::min(1.0f, cinfo->ModHealth) : cinfo->ModHealth; + float factorMana = owner->IsPlayer() ? std::min(1.0f, cinfo->ModMana) : cinfo->ModMana; if (sWorld->getBoolConfig(CONFIG_ALLOWS_RANK_MOD_FOR_PET_HEALTH)) { @@ -1435,7 +1430,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) SetFullHealth(); SetPower(POWER_MANA, GetMaxPower(POWER_MANA)); - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) sScriptMgr->OnAfterGuardianInitStatsForLevel(owner->ToPlayer(), this); return true; @@ -2030,7 +2025,7 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab) { // need update action bar for last removed rank if (Unit* owner = GetOwner()) - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->ToPlayer()->PetSpellInitialize(); } } diff --git a/src/server/game/Entities/Player/KillRewarder.cpp b/src/server/game/Entities/Player/KillRewarder.cpp index 04ba9ca1d..680aaa43e 100644 --- a/src/server/game/Entities/Player/KillRewarder.cpp +++ b/src/server/game/Entities/Player/KillRewarder.cpp @@ -70,7 +70,7 @@ KillRewarder::KillRewarder(Player* killer, Unit* victim, bool isBattleGround) : _isFullXP(false), _maxLevel(0), _isBattleGround(isBattleGround), _isPvP(false) { // mark the credit as pvp if victim is player - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) _isPvP = true; // or if its owned by player and its not a vehicle else if (victim->GetCharmerOrOwnerGUID().IsPlayer()) @@ -201,7 +201,7 @@ void KillRewarder::_RewardPlayer(Player* player, bool isDungeon) // 4.1. Give honor (player must be alive and not on BG). _RewardHonor(player); // 4.1.1 Send player killcredit for quests with PlayerSlain - if (_victim->GetTypeId() == TYPEID_PLAYER) + if (_victim->IsPlayer()) player->KilledPlayerCredit(); } @@ -256,7 +256,7 @@ void KillRewarder::_RewardGroup() { _RewardPlayer(member, isDungeon); // Xinef: only count players - //if (_victim->GetTypeId() == TYPEID_PLAYER) + //if (_victim->IsPlayer()) // member->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL, 1, 0, _victim); } } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c37f5f7e3..fbe3820d5 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5915,7 +5915,7 @@ float Player::CalculateReputationGain(ReputationSource source, uint32 creatureOr // Calculates how many reputation points player gains in victim's enemy factions void Player::RewardReputation(Unit* victim) { - if (!victim || victim->GetTypeId() == TYPEID_PLAYER) + if (!victim || victim->IsPlayer()) return; if (victim->ToCreature()->IsReputationGainDisabled()) @@ -6047,7 +6047,7 @@ bool Player::RewardHonor(Unit* uVictim, uint32 groupsize, int32 honor, bool awar return false; /* check if player has same IP - if (uVictim && uVictim->GetTypeId() == TYPEID_PLAYER) + if (uVictim && uVictim->IsPlayer()) { if (GetSession()->GetRemoteAddress() == uVictim->ToPlayer()->GetSession()->GetRemoteAddress()) return false; @@ -6074,7 +6074,7 @@ bool Player::RewardHonor(Unit* uVictim, uint32 groupsize, int32 honor, bool awar victim_guid = uVictim->GetGUID(); - if (uVictim->GetTypeId() == TYPEID_PLAYER) + if (uVictim->IsPlayer()) { Player* victim = uVictim->ToPlayer(); @@ -6185,7 +6185,7 @@ bool Player::RewardHonor(Unit* uVictim, uint32 groupsize, int32 honor, bool awar if (!uVictim || uVictim == this || uVictim->HasAuraType(SPELL_AURA_NO_PVP_CREDIT)) return true; - if (uVictim->GetTypeId() == TYPEID_PLAYER) + if (uVictim->IsPlayer()) { // Check if allowed to receive it in current map uint8 MapType = sWorld->getIntConfig(CONFIG_PVP_TOKEN_MAP_TYPE); @@ -9172,7 +9172,7 @@ Pet* Player::CreatePet(Creature* creatureTarget, uint32 spellID /*= 0*/) return nullptr; } - if (!creatureTarget || creatureTarget->IsPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER) + if (!creatureTarget || creatureTarget->IsPet() || creatureTarget->IsPlayer()) { return nullptr; } diff --git a/src/server/game/Entities/Player/PlayerQuest.cpp b/src/server/game/Entities/Player/PlayerQuest.cpp index 2da11b7df..1f02dc12b 100644 --- a/src/server/game/Entities/Player/PlayerQuest.cpp +++ b/src/server/game/Entities/Player/PlayerQuest.cpp @@ -551,7 +551,7 @@ void Player::AddQuest(Quest const* quest, Object* questGiver) uint32 timeAllowed = quest->GetTimeAllowed(); // shared timed quest - if (questGiver && questGiver->GetTypeId() == TYPEID_PLAYER) + if (questGiver && questGiver->IsPlayer()) timeAllowed = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].Timer / IN_MILLISECONDS; AddTimedQuest(quest_id); diff --git a/src/server/game/Entities/Player/PlayerUpdates.cpp b/src/server/game/Entities/Player/PlayerUpdates.cpp index 6709ede66..39756e8e4 100644 --- a/src/server/game/Entities/Player/PlayerUpdates.cpp +++ b/src/server/game/Entities/Player/PlayerUpdates.cpp @@ -1947,7 +1947,7 @@ void Player::UpdateCharmedAI() 1 << (CLASS_PRIEST - 1)); // Xinef: charmer type specific actions - if (charmer->GetTypeId() == TYPEID_PLAYER) + if (charmer->IsPlayer()) { bool follow = false; if (!target) diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp index 739ff3935..97cde0794 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -51,7 +51,7 @@ void Totem::InitStats(uint32 duration) if (Unit* owner = ObjectAccessor::GetUnit(*this, m_owner)) { uint32 slot = m_Properties->Slot; - if (owner->GetTypeId() == TYPEID_PLAYER && slot >= SUMMON_SLOT_TOTEM && slot < MAX_TOTEM_SLOT) + if (owner->IsPlayer() && slot >= SUMMON_SLOT_TOTEM && slot < MAX_TOTEM_SLOT) { WorldPackets::Totem::TotemCreated data; data.Totem = GetGUID(); diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 47203f94c..c76c79865 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -442,7 +442,7 @@ void MotionTransport::UnloadNonStaticPassengers() { for (PassengerSet::iterator itr = _passengers.begin(); itr != _passengers.end(); ) { - if ((*itr)->GetTypeId() == TYPEID_PLAYER) + if ((*itr)->IsPlayer()) { ++itr; continue; @@ -518,7 +518,7 @@ bool MotionTransport::TeleportTransport(uint32 newMapid, float x, float y, float // Teleport players, they need to know it for (PassengerSet::iterator itr = _passengers.begin(); itr != _passengers.end(); ++itr) { - if ((*itr)->GetTypeId() == TYPEID_PLAYER) + if ((*itr)->IsPlayer()) { float destX, destY, destZ, destO; (*itr)->m_movementInfo.transport.pos.GetPosition(destX, destY, destZ, destO); diff --git a/src/server/game/Entities/Unit/CharmInfo.cpp b/src/server/game/Entities/Unit/CharmInfo.cpp index 4e0664304..df36bb732 100644 --- a/src/server/game/Entities/Unit/CharmInfo.cpp +++ b/src/server/game/Entities/Unit/CharmInfo.cpp @@ -114,7 +114,7 @@ void CharmInfo::InitCharmCreateSpells() { InitPetActionBar(); - if (_unit->GetTypeId() == TYPEID_PLAYER) // charmed players don't have spells + if (_unit->IsPlayer()) // charmed players don't have spells return; for (uint32 i = 0; i < MAX_SPELL_CHARM; ++i) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6c87bf4cd..2c48d3aa4 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -424,7 +424,7 @@ void Unit::Update(uint32 p_time) SendThreatListUpdate(); // update combat timer only for players and pets (only pets with PetAI) - if (IsInCombat() && (GetTypeId() == TYPEID_PLAYER || ((IsPet() || HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) && IsControlledByPlayer()))) + if (IsInCombat() && (IsPlayer() || ((IsPet() || HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) && IsControlledByPlayer()))) { // Check UNIT_STATE_MELEE_ATTACKING or UNIT_STATE_CHASE (without UNIT_STATE_FOLLOW in this case) so pets can reach far away // targets without stopping half way there and running off. @@ -628,7 +628,7 @@ void Unit::UpdateSplinePosition() //if (HasUnitState(UNIT_STATE_CANNOT_TURN)) // loc.orientation = GetOrientation(); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) UpdatePosition(loc.x, loc.y, loc.z, loc.orientation); else ToCreature()->SetPosition(loc.x, loc.y, loc.z, loc.orientation); @@ -812,7 +812,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage // Hook for OnDamage Event sScriptMgr->OnDamage(attacker, victim, damage); - if (victim->GetTypeId() == TYPEID_PLAYER && attacker != victim) + if (victim->IsPlayer() && attacker != victim) { // Signal to pets that their owner was attacked Pet* pet = victim->ToPlayer()->GetPet(); @@ -822,7 +822,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage } //Dont deal damage to unit if .cheat god is enable. - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { if (victim->ToPlayer()->GetCommandStatus(CHEAT_GOD)) { @@ -848,7 +848,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage // interrupt spells with SPELL_INTERRUPT_FLAG_ABORT_ON_DMG on absorbed damage (no dots) if (!damage && damagetype != DOT && cleanDamage && cleanDamage->absorbed_damage) { - if (victim != attacker && victim->GetTypeId() == TYPEID_PLAYER) + if (victim != attacker && victim->IsPlayer()) { if (Spell* spell = victim->m_currentSpells[CURRENT_GENERIC_SPELL]) { @@ -902,7 +902,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage Unit::DealDamageMods(shareDamageTarget, shareDamage, &shareAbsorb); } - if (attacker && shareDamageTarget->GetTypeId() == TYPEID_PLAYER) + if (attacker && shareDamageTarget->IsPlayer()) { attacker->SendSpellNonMeleeDamageLog(shareDamageTarget, spell, shareDamage, damageSchoolMask, shareAbsorb, shareResist, damagetype == DIRECT_DAMAGE, 0, false, true); } @@ -958,7 +958,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage // duel ends when player has 1 or less hp bool duel_hasEnded = false; bool duel_wasMounted = false; - if (victim->GetTypeId() == TYPEID_PLAYER && victim->ToPlayer()->duel && damage >= (health - 1)) + if (victim->IsPlayer() && victim->ToPlayer()->duel && damage >= (health - 1)) { // xinef: situation not possible earlier, just return silently. if (!attacker) @@ -970,7 +970,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage duel_hasEnded = true; } - else if (victim->IsVehicle() && damage >= (health - 1) && victim->GetCharmer() && victim->GetCharmer()->GetTypeId() == TYPEID_PLAYER) + else if (victim->IsVehicle() && damage >= (health - 1) && victim->GetCharmer() && victim->GetCharmer()->IsPlayer()) { Player* victimRider = victim->GetCharmer()->ToPlayer(); @@ -1004,7 +1004,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage //killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT, damage); // pussywizard: optimization } - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) ;//victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED, damage); // pussywizard: optimization else if (!victim->IsControlledByPlayer() || victim->IsVehicle()) { @@ -1023,7 +1023,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage { LOG_DEBUG("entities.unit", "DealDamage: victim just died"); - //if (attacker && victim->GetTypeId() == TYPEID_PLAYER && victim != attacker) + //if (attacker && victim->IsPlayer() && victim != attacker) //victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, health); // pussywizard: optimization Unit::Kill(attacker, victim, durabilityLoss, cleanDamage ? cleanDamage->attackType : BASE_ATTACK, spellProto, damageSpell); } @@ -1031,7 +1031,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage { LOG_DEBUG("entities.unit", "DealDamageAlive"); - //if (victim->GetTypeId() == TYPEID_PLAYER) + //if (victim->IsPlayer()) // victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, damage); // pussywizard: optimization victim->ModifyHealth(- (int32)damage); @@ -1072,7 +1072,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage victim->RewardRage(rageDamage, 0, false); } - if (attacker && attacker->GetTypeId() == TYPEID_PLAYER) + if (attacker && attacker->IsPlayer()) { // random durability for items (HIT DONE) if (roll_chance_f(sWorld->getRate(RATE_DURABILITY_LOSS_DAMAGE))) @@ -1084,7 +1084,7 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage if (damagetype != NODAMAGE && damage && (!spellProto || !(spellProto->HasAttribute(SPELL_ATTR3_TREAT_AS_PERIODIC) || spellProto->HasAttribute(SPELL_ATTR7_DONT_CAUSE_SPELL_PUSHBACK)))) { - if (victim != attacker && victim->GetTypeId() == TYPEID_PLAYER) // does not support creature push_back + if (victim != attacker && victim->IsPlayer()) // does not support creature push_back { if (damagetype != DOT && !(damageSpell && damageSpell->m_targets.HasDstChannel())) { @@ -1536,7 +1536,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, CalcDamageInfo* damageInfo, Weapon bool const addPctMods = (schoolMask & SPELL_SCHOOL_MASK_NORMAL); uint32 damage = 0; - uint8 itemDamagesMask = (GetTypeId() == TYPEID_PLAYER) ? (1 << i) : 0; + uint8 itemDamagesMask = (IsPlayer()) ? (1 << i) : 0; damage += CalculateDamage(damageInfo->attackType, false, addPctMods, itemDamagesMask); // Add melee damage bonus @@ -1877,7 +1877,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) // If this is a creature and it attacks from behind it has a probability to daze it's victim if ((damageInfo->damages[0].damage + damageInfo->damages[1].damage) && ((damageInfo->hitOutCome == MELEE_HIT_CRIT || damageInfo->hitOutCome == MELEE_HIT_CRUSHING || damageInfo->hitOutCome == MELEE_HIT_NORMAL || damageInfo->hitOutCome == MELEE_HIT_GLANCING) && GetTypeId() != TYPEID_PLAYER && !ToCreature()->IsControlledByPlayer() && !victim->HasInArc(M_PI, this) - && (victim->GetTypeId() == TYPEID_PLAYER || !victim->ToCreature()->isWorldBoss()) && !victim->IsVehicle())) + && (victim->IsPlayer() || !victim->ToCreature()->isWorldBoss()) && !victim->IsVehicle())) { // -probability is between 0% and 40% // 20% base chance @@ -1902,7 +1902,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) CastSpell(victim, 1604, true); } - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->CastItemCombatSpell(victim, damageInfo->attackType, damageInfo->procVictim, damageInfo->procEx); // Do effect if any damage done to target @@ -2021,7 +2021,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit const* attacker, Unit const* victim, co } // Apply Player CR_ARMOR_PENETRATION rating and buffs from stances\specializations etc. - if (attacker->GetTypeId() == TYPEID_PLAYER) + if (attacker->IsPlayer()) { float bonusPct = 0; AuraEffectList const& armorPenAuras = attacker->GetAuraEffectsByType(SPELL_AURA_MOD_ARMOR_PENETRATION_PCT); @@ -2545,7 +2545,7 @@ void Unit::AttackerStateUpdate(Unit* victim, WeaponAttackType attType /*= BASE_A return; // CombatStart puts the target into stand state, so we need to cache sit state here to know if we should crit later - const bool sittingVictim = victim->GetTypeId() == TYPEID_PLAYER && (victim->IsSitState() || victim->getStandState() == UNIT_STAND_STATE_SLEEP); + const bool sittingVictim = victim->IsPlayer() && (victim->IsSitState() || victim->getStandState() == UNIT_STAND_STATE_SLEEP); CombatStart(victim); RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MELEE_ATTACK); @@ -2611,7 +2611,7 @@ void Unit::AttackerStateUpdate(Unit* victim, WeaponAttackType attType /*= BASE_A Unit::ProcDamageAndSpell(damageInfo.attacker, damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, dmgInfo.GetDamage(), damageInfo.attackType, nullptr, nullptr, -1, nullptr, &dmgInfo); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) LOG_DEBUG("entities.unit", "AttackerStateUpdate: (Player) {} attacked {} for {} dmg, absorbed {}, blocked {}, resisted {}.", GetGUID().ToString(), victim->GetGUID().ToString(), dmgInfo.GetDamage(), dmgInfo.GetAbsorb(), dmgInfo.GetBlock(), dmgInfo.GetResist()); else @@ -2620,7 +2620,7 @@ void Unit::AttackerStateUpdate(Unit* victim, WeaponAttackType attType /*= BASE_A // Let the pet know we've started attacking someting. Handles melee attacks only // Spells such as auto-shot and others handled in WorldSession::HandleCastSpellOpcode - if (GetTypeId() == TYPEID_PLAYER && !m_Controlled.empty()) + if (IsPlayer() && !m_Controlled.empty()) for (Unit::ControlSet::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) if (Unit* pet = *itr) if (pet->IsAlive() && pet->GetTypeId() == TYPEID_UNIT) @@ -2800,15 +2800,15 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy // Dodge chance // only players can't dodge if attacker is behind - if (victim->GetTypeId() == TYPEID_PLAYER && !victim->HasInArc(M_PI, this) && !victim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) + if (victim->IsPlayer() && !victim->HasInArc(M_PI, this) && !victim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) { //LOG_DEBUG("entities.unit", "RollMeleeOutcomeAgainst: attack came from behind and victim was a player."); } // Xinef: do not allow to dodge with CREATURE_FLAG_EXTRA_NO_DODGE flag - else if (victim->GetTypeId() == TYPEID_PLAYER || !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_DODGE)) + else if (victim->IsPlayer() || !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_DODGE)) { // Reduce dodge chance by attacker expertise rating - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) dodge_chance -= int32(ToPlayer()->GetExpertiseDodgeOrParryReduction(attType) * 100); else dodge_chance -= GetTotalAuraModifier(SPELL_AURA_MOD_EXPERTISE) * 25; @@ -2842,12 +2842,12 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy else { // Reduce parry chance by attacker expertise rating - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) parry_chance -= int32(ToPlayer()->GetExpertiseDodgeOrParryReduction(attType) * 100); else parry_chance -= GetTotalAuraModifier(SPELL_AURA_MOD_EXPERTISE) * 25; - if (victim->GetTypeId() == TYPEID_PLAYER || !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY)) + if (victim->IsPlayer() || !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY)) { tmp = parry_chance; @@ -2864,7 +2864,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy } } - if (victim->GetTypeId() == TYPEID_PLAYER || !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_BLOCK)) + if (victim->IsPlayer() || !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_BLOCK)) { tmp = block_chance; @@ -2884,7 +2884,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy // Max 40% chance to score a glancing blow against mobs that are higher level (can do only players and pets and not with ranged weapon) if (attType != RANGED_ATTACK && - (GetTypeId() == TYPEID_PLAYER || IsPet()) && + (IsPlayer() || IsPet()) && victim->GetTypeId() != TYPEID_PLAYER && !victim->IsPet() && GetLevel() < victim->getLevelForTarget(this)) { @@ -3052,9 +3052,9 @@ void Unit::SendMeleeAttackStop(Unit* victim) LOG_DEBUG("entities.unit", "WORLD: Sent SMSG_ATTACKSTOP"); if (victim) - LOG_DEBUG("entities.unit", "{} {} stopped attacking {} {}", (GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), GetGUID().ToString(), (victim->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), victim->GetGUID().ToString()); + LOG_DEBUG("entities.unit", "{} {} stopped attacking {} {}", (IsPlayer() ? "Player" : "Creature"), GetGUID().ToString(), (victim->IsPlayer() ? "player" : "creature"), victim->GetGUID().ToString()); else - LOG_DEBUG("entities.unit", "{} {} stopped attacking", (GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), GetGUID().ToString()); + LOG_DEBUG("entities.unit", "{} {} stopped attacking", (IsPlayer() ? "Player" : "Creature"), GetGUID().ToString()); } bool Unit::isSpellBlocked(Unit* victim, SpellInfo const* spellProto, WeaponAttackType attackType) @@ -3180,7 +3180,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit* victim, SpellInfo const* spellInfo if (!victim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION) || spellInfo->HasAttribute(SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET)) { // Can`t dodge from behind in PvP (but its possible in PvE) - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { canDodge = false; } @@ -3235,7 +3235,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit* victim, SpellInfo const* spellInfo dodgeChance += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_COMBAT_RESULT_CHANCE, VICTIMSTATE_DODGE) * 100; dodgeChance = int32(float(dodgeChance) * GetTotalAuraMultiplier(SPELL_AURA_MOD_ENEMY_DODGE)); // Reduce dodge chance by attacker expertise rating - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) dodgeChance -= int32(ToPlayer()->GetExpertiseDodgeOrParryReduction(attType) * 100.0f); else dodgeChance -= GetTotalAuraModifier(SPELL_AURA_MOD_EXPERTISE) * 25; @@ -3254,7 +3254,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit* victim, SpellInfo const* spellInfo // Roll parry int32 parryChance = int32(victim->GetUnitParryChance() * 100.0f) - skillDiff * 4; // Reduce parry chance by attacker expertise rating - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) parryChance -= int32(ToPlayer()->GetExpertiseDodgeOrParryReduction(attType) * 100.0f); else parryChance -= GetTotalAuraModifier(SPELL_AURA_MOD_EXPERTISE) * 25; @@ -3314,12 +3314,12 @@ SpellMissInfo Unit::MagicSpellHitResult(Unit* victim, SpellInfo const* spellInfo int32 MISS_CHANCE_MULTIPLIER; if (sWorld->getBoolConfig(CONFIG_MISS_CHANCE_MULTIPLIER_ONLY_FOR_PLAYERS) && GetTypeId() != TYPEID_PLAYER) // keep it as it was originally (7 and 11) { - MISS_CHANCE_MULTIPLIER = victim->GetTypeId() == TYPEID_PLAYER ? 7 : 11; + MISS_CHANCE_MULTIPLIER = victim->IsPlayer() ? 7 : 11; } else { MISS_CHANCE_MULTIPLIER = sWorld->getRate( - victim->GetTypeId() == TYPEID_PLAYER + victim->IsPlayer() ? RATE_MISS_CHANCE_MULTIPLIER_TARGET_PLAYER : RATE_MISS_CHANCE_MULTIPLIER_TARGET_CREATURE); } @@ -3347,7 +3347,7 @@ SpellMissInfo Unit::MagicSpellHitResult(Unit* victim, SpellInfo const* spellInfo modHitChance -= victim->GetTotalAuraModifier(SPELL_AURA_MOD_AOE_AVOIDANCE); // Decrease hit chance from victim rating bonus - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) modHitChance -= int32(victim->ToPlayer()->GetRatingBonusValue(CR_HIT_TAKEN_SPELL)); } @@ -3584,10 +3584,10 @@ SpellMissInfo Unit::SpellHitResult(Unit* victim, Spell const* spell, bool CanRef uint32 Unit::GetDefenseSkillValue(Unit const* target) const { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { // in PvP use full skill instead current skill value - uint32 value = (target && target->GetTypeId() == TYPEID_PLAYER) + uint32 value = (target && target->IsPlayer()) ? ToPlayer()->GetMaxSkillValue(SKILL_DEFENSE) : ToPlayer()->GetSkillValue(SKILL_DEFENSE); value += uint32(ToPlayer()->GetRatingBonusValue(CR_DEFENSE_SKILL)); @@ -3599,7 +3599,7 @@ uint32 Unit::GetDefenseSkillValue(Unit const* target) const float Unit::GetUnitDodgeChance() const { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) return ToPlayer()->GetRealDodge(); //GetFloatValue(PLAYER_DODGE_PERCENTAGE); else { @@ -3689,7 +3689,7 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, Unit const* victi { float crit; - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { switch (attackType) { @@ -3875,7 +3875,7 @@ void Unit::_UpdateAutoRepeatSpell() static uint32 const HUNTER_AUTOSHOOT = 75; // Check "realtime" interrupts - if ((GetTypeId() == TYPEID_PLAYER && ToPlayer()->isMoving() && spellProto->Id != HUNTER_AUTOSHOOT) || IsNonMeleeSpellCast(false, false, true, spellProto->Id == HUNTER_AUTOSHOOT)) + if ((IsPlayer() && ToPlayer()->isMoving()) || IsNonMeleeSpellCast(false, false, true, spellProto->Id == HUNTER_AUTOSHOOT)) { // cancel wand shoot if (spellProto->Id != HUNTER_AUTOSHOOT) @@ -3884,8 +3884,7 @@ void Unit::_UpdateAutoRepeatSpell() return; } - // Apply delay (Hunter's autoshoot not affected) - if (m_AutoRepeatFirstCast && getAttackTimer(RANGED_ATTACK) < 500 && spellProto->Id != HUNTER_AUTOSHOOT) + if (m_AutoRepeatFirstCast && getAttackTimer(RANGED_ATTACK) < 500) { setAttackTimer(RANGED_ATTACK, 500); } @@ -4032,7 +4031,7 @@ void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool wi // send autorepeat cancel message for autorepeat spells if (spellType == CURRENT_AUTOREPEAT_SPELL) - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->SendAutoRepeatCancel(this); if (spell->getState() != SPELL_STATE_FINISHED) @@ -5185,17 +5184,12 @@ void Unit::RemoveMovementImpairingAuras(bool withRoot) for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) { Aura const* aura = iter->second->GetBase(); - if (aura->GetSpellInfo()->Mechanic == MECHANIC_SNARE) + if (aura->GetSpellInfo()->Mechanic == MECHANIC_SNARE || aura->GetSpellInfo()->HasEffectMechanic(MECHANIC_SNARE)) { RemoveAura(iter); continue; } - // Xinef: turn off snare auras by setting amount to 0 :) - for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) - if (((1 << i) & iter->second->GetEffectMask()) && aura->GetSpellInfo()->Effects[i].Mechanic == MECHANIC_SNARE) - aura->GetEffect(i)->ChangeAmount(0); - ++iter; } } @@ -6134,7 +6128,7 @@ void Unit::AddGameObject(GameObject* gameObj) m_gameObj.push_back(gameObj->GetGUID()); gameObj->SetOwnerGUID(GetGUID()); - if (GetTypeId() == TYPEID_PLAYER && gameObj->GetSpellId()) + if (IsPlayer() && gameObj->GetSpellId()) { SpellInfo const* createBySpell = sSpellMgr->GetSpellInfo(gameObj->GetSpellId()); // Need disable spell use for owner @@ -6165,7 +6159,7 @@ void Unit::RemoveGameObject(GameObject* gameObj, bool del) { RemoveAurasDueToSpell(spellid); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { SpellInfo const* createBySpell = sSpellMgr->GetSpellInfo(spellid); // Need activate spell use for owner @@ -6235,7 +6229,7 @@ void Unit::SendSpellNonMeleeReflectLog(SpellNonMeleeDamage* log, Unit* attacker) //IF we are in cheat mode we swap absorb with damage and set damage to 0, this way we can still debug damage but our hp bar will not drop uint32 damage = log->damage; uint32 absorb = log->absorb; - if (log->target->GetTypeId() == TYPEID_PLAYER && log->target->ToPlayer()->GetCommandStatus(CHEAT_GOD)) + if (log->target->IsPlayer() && log->target->ToPlayer()->GetCommandStatus(CHEAT_GOD)) { absorb = damage; damage = 0; @@ -6263,7 +6257,7 @@ void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage* log) //IF we are in cheat mode we swap absorb with damage and set damage to 0, this way we can still debug damage but our hp bar will not drop uint32 damage = log->damage; uint32 absorb = log->absorb; - if (log->target->GetTypeId() == TYPEID_PLAYER && log->target->ToPlayer()->GetCommandStatus(CHEAT_GOD)) + if (log->target->IsPlayer() && log->target->ToPlayer()->GetCommandStatus(CHEAT_GOD)) { absorb = damage; damage = 0; @@ -6353,7 +6347,7 @@ void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo* pInfo) //IF we are in cheat mode we swap absorb with damage and set damage to 0, this way we can still debug damage but our hp bar will not drop uint32 damage = pInfo->damage; uint32 absorb = pInfo->absorb; - if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->GetCommandStatus(CHEAT_GOD)) + if (IsPlayer() && ToPlayer()->GetCommandStatus(CHEAT_GOD)) { absorb = damage; damage = 0; @@ -6437,7 +6431,7 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo* damageInfo) //IF we are in cheat mode we swap absorb with damage and set damage to 0, this way we can still debug damage but our hp bar will not drop tmpDamage[i] = damageInfo->damages[i].damage; tmpAbsorb[i] = damageInfo->damages[i].absorb; - if (damageInfo->target->GetTypeId() == TYPEID_PLAYER && damageInfo->target->ToPlayer()->GetCommandStatus(CHEAT_GOD)) + if (damageInfo->target->IsPlayer() && damageInfo->target->ToPlayer()->GetCommandStatus(CHEAT_GOD)) { tmpAbsorb[i] = tmpDamage[i]; tmpDamage[i] = 0; @@ -6543,7 +6537,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere int32 triggerAmount = triggeredByAura->GetAmount(); Spell const* spellProc = eventInfo.GetProcSpell(); - Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER + Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && IsPlayer() ? ToPlayer()->GetItemByGuid(triggeredByAura->GetBase()->GetCastItemGUID()) : nullptr; uint32 triggered_spell_id = 0; @@ -7401,7 +7395,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere int32 basepoints1 = CalculatePct(GetMaxPower(Powers(POWER_MANA)), triggerAmount * 2); // Improved Leader of the Pack // Check cooldown of heal spell cooldown - if (GetTypeId() == TYPEID_PLAYER && !ToPlayer()->HasSpellCooldown(34299)) + if (IsPlayer() && !ToPlayer()->HasSpellCooldown(34299)) CastCustomSpell(this, 68285, &basepoints1, 0, 0, true, 0, triggeredByAura); break; } @@ -7495,7 +7489,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } } // Eclipse - if (dummySpell->SpellIconID == 2856 && GetTypeId() == TYPEID_PLAYER) + if (dummySpell->SpellIconID == 2856 && IsPlayer()) { if (!procSpell || effIndex != 0) return false; @@ -8548,7 +8542,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere break; } // Sudden Doom - if (dummySpell->SpellIconID == 1939 && GetTypeId() == TYPEID_PLAYER) + if (dummySpell->SpellIconID == 1939 && IsPlayer()) { SpellChainNode const* chain = nullptr; // get highest rank of the Death Coil spell @@ -8889,7 +8883,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg if (triggeredByAura->GetAuraType() == SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE) basepoints0 = triggerAmount; - Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER + Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && IsPlayer() ? ToPlayer()->GetItemByGuid(triggeredByAura->GetBase()->GetCastItemGUID()) : nullptr; // Try handle unknown trigger spells @@ -9610,7 +9604,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg case 15250: // Rogue Setup { // applied only for main target - if (!victim || (GetTypeId() == TYPEID_PLAYER && victim != ToPlayer()->GetSelectedUnit())) + if (!victim || (IsPlayer() && victim != ToPlayer()->GetSelectedUnit())) return false; break; // continue normal case } @@ -9676,7 +9670,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg case 50227: { // Remove cooldown on Shield Slam - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->RemoveCategoryCooldown(1209); break; } @@ -9722,7 +9716,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg case 58628: { // remove cooldown of Death Grip - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->RemoveSpellCooldown(49576, true); return true; } @@ -9806,7 +9800,7 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au if (!victim || !victim->IsAlive()) return false; - Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && GetTypeId() == TYPEID_PLAYER + Item* castItem = triggeredByAura->GetBase()->GetCastItemGUID() && IsPlayer() ? ToPlayer()->GetItemByGuid(triggeredByAura->GetBase()->GetCastItemGUID()) : nullptr; uint32 triggered_spell_id = 0; @@ -9921,7 +9915,7 @@ void Unit::setPowerType(Powers new_powertype) { SetByteValue(UNIT_FIELD_BYTES_0, 3, new_powertype); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { if (ToPlayer()->GetGroup()) ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POWER_TYPE); @@ -9931,7 +9925,7 @@ void Unit::setPowerType(Powers new_powertype) if (pet->isControlled()) { Unit* owner = GetOwner(); - if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && owner->ToPlayer()->GetGroup()) + if (owner && (owner->IsPlayer()) && owner->ToPlayer()->GetGroup()) owner->ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_POWER_TYPE); } } @@ -10092,7 +10086,7 @@ ReputationRank Unit::GetReactionTo(Unit const* target, bool checkOriginalFaction FactionTemplateEntry const* factionTemplateEntry = nullptr; if (checkOriginalFaction) { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { if (ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(getRace())) { @@ -10241,7 +10235,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) return false; // player cannot attack in mount state - if (GetTypeId() == TYPEID_PLAYER && IsMounted()) + if (IsPlayer() && IsMounted()) return false; // creatures cannot attack while evading @@ -10261,7 +10255,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) // return false; // nobody can attack GM in GM-mode - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { if (victim->ToPlayer()->IsGameMaster()) return false; @@ -10328,7 +10322,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) { // should not let player enter combat by right clicking target - doesn't helps SetInCombatWith(victim); - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) victim->SetInCombatWith(this); AddThreat(victim, 0.0f); @@ -10394,7 +10388,7 @@ void Unit::CombatStop(bool includingCast) AttackStop(); RemoveAllAttackers(); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->SendAttackSwingCancelAttack(); // melee and ranged forced attack cancel ClearInCombat(); @@ -10642,7 +10636,7 @@ void Unit::SetMinion(Minion* minion, bool apply) m_Controlled.insert(minion); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { minion->m_ControlledByPlayer = true; minion->SetUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); @@ -10693,7 +10687,7 @@ void Unit::SetMinion(Minion* minion, bool apply) if (minion->IsPetGhoul() || minion->GetEntry() == 24207 /*ENTRY_ARMY_OF_THE_DEAD*/) minion->setPowerType(POWER_ENERGY); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { // Send infinity cooldown - client does that automatically but after relog cooldown needs to be set again SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(minion->GetUInt32Value(UNIT_CREATED_BY_SPELL)); @@ -10738,7 +10732,7 @@ void Unit::SetMinion(Minion* minion, bool apply) } } - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(minion->GetUInt32Value(UNIT_CREATED_BY_SPELL)); // Remove infinity cooldown @@ -10777,7 +10771,7 @@ void Unit::SetMinion(Minion* minion, bool apply) if (AddGuidValue(UNIT_FIELD_SUMMON, (*itr)->GetGUID())) { // show another pet bar if there is no charm bar - if (GetTypeId() == TYPEID_PLAYER && !GetCharmGUID()) + if (IsPlayer() && !GetCharmGUID()) { if ((*itr)->IsPet()) ToPlayer()->PetSpellInitialize(); @@ -10821,7 +10815,7 @@ void Unit::SetCharm(Unit* charm, bool apply) { if (apply) { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { if (!AddGuidValue(UNIT_FIELD_CHARM, charm->GetGUID())) LOG_FATAL("entities.unit", "Player {} is trying to charm unit {}, but it already has a charmed unit {}", GetName(), charm->GetEntry(), GetCharmGUID().ToString()); @@ -10850,7 +10844,7 @@ void Unit::SetCharm(Unit* charm, bool apply) } else { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { if (!RemoveGuidValue(UNIT_FIELD_CHARM, charm->GetGUID())) LOG_FATAL("entities.unit", "Player {} is trying to uncharm unit {}, but it has another charmed unit {}", GetName(), charm->GetEntry(), GetCharmGUID().ToString()); @@ -10859,7 +10853,7 @@ void Unit::SetCharm(Unit* charm, bool apply) if (!charm->RemoveGuidValue(UNIT_FIELD_CHARMEDBY, GetGUID())) LOG_FATAL("entities.unit", "Unit {} is being uncharmed, but it has another charmer {}", charm->GetEntry(), charm->GetCharmerGUID().ToString()); - if (charm->GetTypeId() == TYPEID_PLAYER) + if (charm->IsPlayer()) { charm->m_ControlledByPlayer = true; charm->SetUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); @@ -11030,7 +11024,7 @@ Unit* Unit::GetFirstControlled() const void Unit::RemoveAllControlled(bool onDeath /*= false*/) { // possessed pet and vehicle - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->StopCastingCharm(); while (!m_Controlled.empty()) @@ -11058,7 +11052,7 @@ void Unit::RemoveAllControlled(bool onDeath /*= false*/) Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) { Player* player = nullptr; - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) player = ToPlayer(); // Should we enable this also for charmed units? else if (GetTypeId() == TYPEID_UNIT && IsPet()) @@ -11891,7 +11885,7 @@ int32 Unit::SpellBaseDamageBonusDone(SpellSchoolMask schoolMask) // 0 == any inventory type (not wand then) DoneAdvertisedBenefit += (*i)->GetAmount(); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { // Base value DoneAdvertisedBenefit += ToPlayer()->GetBaseSpellPowerBonus(); @@ -11957,7 +11951,7 @@ float Unit::SpellDoneCritChance(Unit const* /*victim*/, SpellInfo const* spellPr if (schoolMask & SPELL_SCHOOL_MASK_NORMAL) crit_chance = 0.0f; // For other schools - else if (GetTypeId() == TYPEID_PLAYER) + else if (IsPlayer()) crit_chance = GetFloatValue(static_cast(PLAYER_SPELL_CRIT_PERCENTAGE1) + GetFirstSchoolInMask(schoolMask)); else { @@ -11969,7 +11963,7 @@ float Unit::SpellDoneCritChance(Unit const* /*victim*/, SpellInfo const* spellPr case SPELL_DAMAGE_CLASS_MELEE: case SPELL_DAMAGE_CLASS_RANGED: { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { switch (attackType) { @@ -12167,7 +12161,7 @@ float Unit::SpellTakenCritChance(Unit const* caster, SpellInfo const* spellProto } // 100% critical chance against sitting target - if (GetTypeId() == TYPEID_PLAYER && (IsSitState() || getStandState() == UNIT_STAND_STATE_SLEEP)) + if (IsPlayer() && (IsSitState() || getStandState() == UNIT_STAND_STATE_SLEEP)) { return 100.0f; } @@ -12653,7 +12647,7 @@ int32 Unit::SpellBaseHealingBonusDone(SpellSchoolMask schoolMask) AdvertisedBenefit += (*i)->GetAmount(); // Healing bonus of spirit, intellect and strength - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { // Base value AdvertisedBenefit += ToPlayer()->GetBaseSpellPowerBonus(); @@ -13487,7 +13481,7 @@ void Unit::Dismount() SendMessageToSet(&data, true); // dismount as a vehicle - if (GetTypeId() == TYPEID_PLAYER && GetVehicleKit()) + if (IsPlayer() && GetVehicleKit()) { // Send other players that we are no longer a vehicle data.Initialize(SMSG_PLAYER_VEHICLE_DATA, 8 + 4); @@ -13536,7 +13530,7 @@ void Unit::SetInCombatWith(Unit* enemy, uint32 duration) } // check for duel - if (eOwner->GetTypeId() == TYPEID_PLAYER && eOwner->ToPlayer()->duel) + if (eOwner->IsPlayer() && eOwner->ToPlayer()->duel) { Unit const* myOwner = GetCharmerOrOwnerOrSelf(); if (((Player const*)eOwner)->duel->Opponent == myOwner) @@ -13631,7 +13625,7 @@ void Unit::CombatStart(Unit* victim, bool initialAggro) } Unit* who = victim->GetCharmerOrOwnerOrSelf(); - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) SetContestedPvP(who->ToPlayer()); Player* player = GetCharmerOrOwnerPlayerOrPlayerItself(); @@ -13658,7 +13652,7 @@ void Unit::CombatStartOnCast(Unit* target, bool initialAggro, uint32 duration) } Unit* who = target->GetCharmerOrOwnerOrSelf(); - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) SetContestedPvP(who->ToPlayer()); Player* player = GetCharmerOrOwnerPlayerOrPlayerItself(); @@ -13800,7 +13794,7 @@ bool Unit::isTargetableForAttack(bool checkFakeDeath, Unit const* byWho) const if (IsImmuneToPC() && byWho && byWho->GetCharmerOrOwnerPlayerOrPlayerItself()) return false; - if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->IsGameMaster()) + if (IsPlayer() && ToPlayer()->IsGameMaster()) return false; return !HasUnitState(UNIT_STATE_UNATTACKABLE) && (!checkFakeDeath || !HasUnitState(UNIT_STATE_DIED)); @@ -13822,7 +13816,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo // can't attack unattackable units or GMs if (target->HasUnitState(UNIT_STATE_UNATTACKABLE) - || (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->IsGameMaster())) + || (target->IsPlayer() && target->ToPlayer()->IsGameMaster())) return false; // can't attack own vehicle or passenger @@ -13833,7 +13827,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo // can't attack invisible (ignore stealth for aoe spells) also if the area being looked at is from a spell use the dynamic object created instead of the casting unit. //Ignore stealth if target is player and unit in combat with same player - if ((!bySpell || !bySpell->HasAttribute(SPELL_ATTR6_IGNORE_PHASE_SHIFT)) && (obj ? !obj->CanSeeOrDetect(target, bySpell && bySpell->IsAffectingArea()) : !CanSeeOrDetect(target, (bySpell && bySpell->IsAffectingArea()) || (target->GetTypeId() == TYPEID_PLAYER && target->HasStealthAura() && target->IsInCombat() && IsInCombatWith(target))))) + if ((!bySpell || !bySpell->HasAttribute(SPELL_ATTR6_IGNORE_PHASE_SHIFT)) && (obj ? !obj->CanSeeOrDetect(target, bySpell && bySpell->IsAffectingArea()) : !CanSeeOrDetect(target, (bySpell && bySpell->IsAffectingArea()) || (target->IsPlayer() && target->HasStealthAura() && target->IsInCombat() && IsInCombatWith(target))))) return false; // can't attack dead @@ -13878,10 +13872,10 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo { Player* owner = GetAffectingPlayer(); Unit const* const thisUnit = owner ? owner : this; - if (!(target->GetTypeId() == TYPEID_PLAYER && thisUnit->GetTypeId() == TYPEID_PLAYER) && + if (!(target->IsPlayer() && thisUnit->IsPlayer()) && !(target->GetTypeId() == TYPEID_UNIT && thisUnit->GetTypeId() == TYPEID_UNIT)) { - Player const* player = target->GetTypeId() == TYPEID_PLAYER ? target->ToPlayer() : thisUnit->ToPlayer(); + Player const* player = target->IsPlayer() ? target->ToPlayer() : thisUnit->ToPlayer(); Unit const* creature = target->GetTypeId() == TYPEID_UNIT ? target : thisUnit; if (FactionTemplateEntry const* factionTemplate = creature->GetFactionTemplateEntry()) @@ -13945,7 +13939,7 @@ bool Unit::_IsValidAssistTarget(Unit const* target, SpellInfo const* bySpell) co // can't assist unattackable units or GMs if (target->HasUnitState(UNIT_STATE_UNATTACKABLE) - || (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->IsGameMaster())) + || (target->IsPlayer() && target->ToPlayer()->IsGameMaster())) return false; // can't assist own vehicle or passenger @@ -14265,7 +14259,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) non_stack_bonus += GetMaxPositiveAuraModifier(SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK) / 100.0f; // Update speed for vehicle if available - if (GetTypeId() == TYPEID_PLAYER && GetVehicle()) + if (IsPlayer() && GetVehicle()) GetVehicleBase()->UpdateSpeed(MOVE_FLIGHT, true); break; } @@ -14418,7 +14412,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) } else { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { // register forced speed changes for WorldSession::HandleForceSpeedChangeAck // and do it only for real sent packets and use run for run/mounted as client expected @@ -14601,7 +14595,7 @@ void Unit::TauntApply(Unit* taunter) { ASSERT(GetTypeId() == TYPEID_UNIT); - if (!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && taunter->ToPlayer()->IsGameMaster())) + if (!taunter || (taunter->IsPlayer() && taunter->ToPlayer()->IsGameMaster())) return; if (!CanHaveThreatList()) @@ -14631,7 +14625,7 @@ void Unit::TauntFadeOut(Unit* taunter) { ASSERT(GetTypeId() == TYPEID_UNIT); - if (!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && taunter->ToPlayer()->IsGameMaster())) + if (!taunter || (taunter->IsPlayer() && taunter->ToPlayer()->IsGameMaster())) return; if (!CanHaveThreatList()) @@ -14996,9 +14990,9 @@ float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32& duration, Unit const* target = targetOwner ? targetOwner : this; Unit const* source = casterOwner ? casterOwner : caster; - if ((target->GetTypeId() == TYPEID_PLAYER + if ((target->IsPlayer() || target->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH) - && source->GetTypeId() == TYPEID_PLAYER) + && source->IsPlayer()) duration = limitduration; } @@ -15032,7 +15026,7 @@ float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32& duration, } // Some diminishings applies to mobs too (for example, Stun) else if ((GetDiminishingReturnsGroupType(group) == DRTYPE_PLAYER - && ((targetOwner ? (targetOwner->GetTypeId() == TYPEID_PLAYER) : (GetTypeId() == TYPEID_PLAYER)) + && ((targetOwner ? (targetOwner->IsPlayer()) : (IsPlayer())) || (GetTypeId() == TYPEID_UNIT && ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH))) || GetDiminishingReturnsGroupType(group) == DRTYPE_ALL) { @@ -15117,7 +15111,7 @@ float Unit::GetSpellMinRangeForTarget(Unit const* target, SpellInfo const* spell uint32 Unit::GetCreatureType() const { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { ShapeshiftForm form = GetShapeshiftForm(); SpellShapeshiftFormEntry const* ssEntry = sSpellShapeshiftFormStore.LookupEntry(form); @@ -15402,10 +15396,10 @@ void Unit::SetLevel(uint8 lvl, bool showLevelChange) _changesMask.UnsetBit(UNIT_FIELD_LEVEL); // group update - if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->GetGroup()) + if (IsPlayer() && ToPlayer()->GetGroup()) ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_LEVEL); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { sCharacterCache->UpdateCharacterLevel(GetGUID(), lvl); } @@ -15415,7 +15409,7 @@ void Unit::SetHealth(uint32 val) { if (getDeathState() == DeathState::JustDied) val = 0; - else if (GetTypeId() == TYPEID_PLAYER && getDeathState() == DeathState::Dead) + else if (IsPlayer() && getDeathState() == DeathState::Dead) val = 1; else { @@ -15435,7 +15429,7 @@ void Unit::SetHealth(uint32 val) } // group update - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { Player* player = ToPlayer(); if (player->NeedSendSpectatorData()) @@ -15470,7 +15464,7 @@ void Unit::SetMaxHealth(uint32 val) SetUInt32Value(UNIT_FIELD_MAXHEALTH, val); // group update - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { Player* player = ToPlayer(); if (player->NeedSendSpectatorData()) @@ -15528,11 +15522,11 @@ void Unit::SetPower(Powers power, uint32 val, bool withPowerUpdate /*= true*/, b data << GetPackGUID(); data << uint8(power); data << uint32(val); - SendMessageToSet(&data, GetTypeId() == TYPEID_PLAYER); + SendMessageToSet(&data, IsPlayer()); } // group update - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { Player* player = ToPlayer(); if (getPowerType() == power && player->NeedSendSpectatorData()) @@ -15550,7 +15544,7 @@ void Unit::SetPower(Powers power, uint32 val, bool withPowerUpdate /*= true*/, b if (pet->isControlled()) { Unit* owner = GetOwner(); - if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && owner->ToPlayer()->GetGroup()) + if (owner && (owner->IsPlayer()) && owner->ToPlayer()->GetGroup()) { owner->ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_CUR_POWER); } @@ -15570,7 +15564,7 @@ void Unit::SetMaxPower(Powers power, uint32 val) SetStatInt32Value(static_cast(UNIT_FIELD_MAXPOWER1) + power, val); // group update - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { Player* player = ToPlayer(); if (getPowerType() == power && player->NeedSendSpectatorData()) @@ -15584,7 +15578,7 @@ void Unit::SetMaxPower(Powers power, uint32 val) if (pet->isControlled()) { Unit* owner = GetOwner(); - if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && owner->ToPlayer()->GetGroup()) + if (owner && (owner->IsPlayer()) && owner->ToPlayer()->GetGroup()) owner->ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MAX_POWER); } } @@ -15603,11 +15597,11 @@ uint32 Unit::GetCreatePowers(Powers power) const case POWER_RAGE: return 1000; case POWER_FOCUS: - return (GetTypeId() == TYPEID_PLAYER || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : 100); + return (IsPlayer() || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : 100); case POWER_ENERGY: return 100; case POWER_HAPPINESS: - return (GetTypeId() == TYPEID_PLAYER || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : 1050000); + return (IsPlayer() || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : 1050000); case POWER_RUNIC_POWER: return 1000; case POWER_RUNE: @@ -15720,7 +15714,7 @@ void Unit::CleanupsBeforeDelete(bool finalCleanup) void Unit::UpdateCharmAI() { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) return; if (i_disabledAI) // disabled AI must be primary AI @@ -15991,7 +15985,7 @@ uint32 createProcExtendMask(SpellNonMeleeDamage* damageInfo, SpellMissInfo missC void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellInfo const* procSpellInfo, uint32 damage, SpellInfo const* procAura, int8 procAuraEffectIndex, Spell const* procSpell, DamageInfo* damageInfo, HealInfo* healInfo, uint32 procPhase) { // Player is loaded now - do not allow passive spell casts to proc - if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->GetSession()->PlayerLoading()) + if (IsPlayer() && ToPlayer()->GetSession()->PlayerLoading()) return; // For melee/ranged based attack need update skills and set some Aura states if victim present if (procFlag & MELEE_BASED_TRIGGER_MASK && target && procPhase == PROC_SPELL_PHASE_HIT) @@ -16667,7 +16661,7 @@ void Unit::SetStandState(uint8 state) if (IsStandState()) RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_SEATED); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { WorldPacket data(SMSG_STANDSTATE_UPDATE, 1); data << (uint8)state; @@ -16692,7 +16686,7 @@ void Unit::RecalculateObjectScale() { int32 scaleAuras = GetTotalAuraModifier(SPELL_AURA_MOD_SCALE) + GetTotalAuraModifier(SPELL_AURA_MOD_SCALE_2); float scale = GetNativeObjectScale() + CalculatePct(1.0f, scaleAuras); - float scaleMin = GetTypeId() == TYPEID_PLAYER ? 0.1f : 0.01f; + float scaleMin = IsPlayer() ? 0.1f : 0.01f; SetObjectScale(std::max(scale, scaleMin)); } @@ -16870,7 +16864,7 @@ void Unit::ClearAllReactives() ModifyAuraState(AURA_STATE_DEFENSE, false); if (IsClass(CLASS_HUNTER, CLASS_CONTEXT_ABILITY_REACTIVE) && HasAuraState(AURA_STATE_HUNTER_PARRY)) ModifyAuraState(AURA_STATE_HUNTER_PARRY, false); - if (IsClass(CLASS_WARRIOR, CLASS_CONTEXT_ABILITY_REACTIVE) && GetTypeId() == TYPEID_PLAYER) + if (IsClass(CLASS_WARRIOR, CLASS_CONTEXT_ABILITY_REACTIVE) && IsPlayer()) ClearComboPoints(); } @@ -17121,7 +17115,7 @@ void Unit::UpdateAuraForGroup(uint8 slot) if (pet->isControlled()) { Unit* owner = GetOwner(); - if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && owner->ToPlayer()->GetGroup()) + if (owner && (owner->IsPlayer()) && owner->ToPlayer()->GetGroup()) { owner->ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_AURAS); pet->SetAuraUpdateMaskForRaid(slot); @@ -17329,7 +17323,7 @@ bool Unit::InitTamedPet(Pet* pet, uint8 level, uint32 spell_id) pet->SetFaction(GetFaction()); pet->SetUInt32Value(UNIT_CREATED_BY_SPELL, spell_id); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) pet->ReplaceAllUnitFlags(UNIT_FLAG_PLAYER_CONTROLLED); if (!pet->InitStatsForLevel(level)) @@ -17393,7 +17387,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit* victim, Aura* aura, WeaponAttackTyp if (!sSpellMgr->IsSpellProcEventCanTriggeredBy(spellProto, spellProcEvent, EventProcFlag, eventInfo, active)) return false; // In most cases req get honor or XP from kill - if (EventProcFlag & PROC_FLAG_KILL && GetTypeId() == TYPEID_PLAYER) + if (EventProcFlag & PROC_FLAG_KILL && IsPlayer()) { bool allow = false; @@ -17413,7 +17407,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit* victim, Aura* aura, WeaponAttackTyp return false; // Check if current equipment allows aura to proc - if (!isVictim && GetTypeId() == TYPEID_PLAYER && !spellProto->HasAttribute(SPELL_ATTR3_NO_PROC_EQUIP_REQUIREMENT)) + if (!isVictim && IsPlayer() && !spellProto->HasAttribute(SPELL_ATTR3_NO_PROC_EQUIP_REQUIREMENT)) { Player* player = ToPlayer(); if (spellProto->EquippedItemClass == ITEM_CLASS_WEAPON) @@ -17515,7 +17509,7 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura) std::list nearMembers; Player* player = nullptr; - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) player = ToPlayer(); else if (GetOwner()) player = GetOwner()->ToPlayer(); @@ -17763,7 +17757,7 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp // Spirit of Redemption // if talent known but not triggered (check priest class for speedup check) bool spiritOfRedemption = false; - if (victim->GetTypeId() == TYPEID_PLAYER && victim->IsClass(CLASS_PRIEST, CLASS_CONTEXT_ABILITY) && !victim->ToPlayer()->HasPlayerFlag(PLAYER_FLAGS_IS_OUT_OF_BOUNDS)) + if (victim->IsPlayer() && victim->IsClass(CLASS_PRIEST, CLASS_CONTEXT_ABILITY) && !victim->ToPlayer()->HasPlayerFlag(PLAYER_FLAGS_IS_OUT_OF_BOUNDS)) { if (AuraEffect* aurEff = victim->GetAuraEffectDummy(20711)) { @@ -17916,7 +17910,7 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp bf->HandleKill(player, victim); } - //if (victim->GetTypeId() == TYPEID_PLAYER) + //if (victim->IsPlayer()) // if (OutdoorPvP* pvp = victim->ToPlayer()->GetOutdoorPvP()) // pvp->HandlePlayerActivityChangedpVictim->ToPlayer(); @@ -17924,18 +17918,18 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp if (player) if (Battleground* bg = player->GetBattleground()) { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) bg->HandleKillPlayer(victim->ToPlayer(), player); else bg->HandleKillUnit(victim->ToCreature(), player); } // achievement stuff - if (killer && victim->GetTypeId() == TYPEID_PLAYER) + if (killer && victim->IsPlayer()) { if (killer->GetTypeId() == TYPEID_UNIT) victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE, killer->GetEntry()); - else if (victim != killer && killer->GetTypeId() == TYPEID_PLAYER) + else if (victim != killer && killer->IsPlayer()) victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_PLAYER, 1, killer->ToPlayer()->GetTeamId()); } @@ -18000,7 +17994,7 @@ void Unit::SetControlled(bool apply, UnitState state, Unit* source /*= nullptr*/ break; } - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { sScriptMgr->AnticheatSetRootACKUpd(ToPlayer()); } @@ -18093,7 +18087,7 @@ void Unit::SetStunned(bool apply) SetTarget(); SetUnitFlag(UNIT_FLAG_STUNNED); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { SetStandState(UNIT_STAND_STATE_STAND); } @@ -18234,7 +18228,7 @@ void Unit::SetFeared(bool apply, Unit* fearedBy /*= nullptr*/, bool isFear /*= f } // xinef: block / allow control to real mover (eg. charmer) - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { if (m_movedByPlayer) m_movedByPlayer->ToPlayer()->SetClientControl(this, !apply); // verified @@ -18266,7 +18260,7 @@ void Unit::SetConfused(bool apply) } // xinef: block / allow control to real mover (eg. charmer) - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { if (m_movedByPlayer) m_movedByPlayer->ToPlayer()->SetClientControl(this, !apply); // verified @@ -18286,13 +18280,13 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au } // dismount players when charmed - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) RemoveAurasByType(SPELL_AURA_MOUNTED); - if (charmer->GetTypeId() == TYPEID_PLAYER) + if (charmer->IsPlayer()) charmer->RemoveAurasByType(SPELL_AURA_MOUNTED); - ASSERT(type != CHARM_TYPE_POSSESS || charmer->GetTypeId() == TYPEID_PLAYER); + ASSERT(type != CHARM_TYPE_POSSESS || charmer->IsPlayer()); if (type == CHARM_TYPE_VEHICLE && !IsVehicle()) // pussywizard throw 1; ASSERT((type == CHARM_TYPE_VEHICLE) == IsVehicle()); @@ -18309,7 +18303,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au //if (HasUnitState(UNIT_STATE_UNATTACKABLE)) // return false; - if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->GetTransport()) + if (IsPlayer() && ToPlayer()->GetTransport()) { LOG_FATAL("entities.unit", "Unit::SetCharmedBy: Player on transport is trying to charm {} ({})", GetEntry(), GetGUID().ToString()); return false; @@ -18340,7 +18334,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au } // Charmed stop charming - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { ToPlayer()->StopCastingCharm(aurApp ? aurApp->GetBase() : nullptr); ToPlayer()->StopCastingBindSight(aurApp ? aurApp->GetBase() : nullptr); @@ -18373,7 +18367,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au GetMotionMaster()->MoveIdle(); StopMoving(); - if (charmer->GetTypeId() == TYPEID_PLAYER && charmer->IsClass(CLASS_WARLOCK, CLASS_CONTEXT_PET_CHARM) && ToCreature()->GetCreatureTemplate()->type == CREATURE_TYPE_DEMON) + if (charmer->IsPlayer() && charmer->IsClass(CLASS_WARLOCK, CLASS_CONTEXT_PET_CHARM) && ToCreature()->GetCreatureTemplate()->type == CREATURE_TYPE_DEMON) { // Disable CreatureAI/SmartAI and switch to CharmAI when charmed by warlock Creature* charmed = ToCreature(); @@ -18386,7 +18380,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au } // Xinef: If creature can fly, add normal player flying flag (fixes speed) - if (charmer->GetTypeId() == TYPEID_PLAYER && ToCreature()->CanFly()) + if (charmer->IsPlayer() && ToCreature()->CanFly()) AddUnitMovementFlag(MOVEMENTFLAG_FLYING); } else @@ -18465,13 +18459,13 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au break; } } - else if (GetTypeId() == TYPEID_PLAYER) + else if (IsPlayer()) RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT); if (Creature* creature = ToCreature()) creature->RefreshSwimmingFlag(); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) sScriptMgr->OnPlayerBeingCharmed(ToPlayer(), charmer, _oldFactionId, charmer->GetFaction()); return true; @@ -18534,7 +18528,7 @@ void Unit::RemoveCharmedBy(Unit* charmer) if (!charmer) return; - ASSERT(type != CHARM_TYPE_POSSESS || charmer->GetTypeId() == TYPEID_PLAYER); + ASSERT(type != CHARM_TYPE_POSSESS || charmer->IsPlayer()); ASSERT(type != CHARM_TYPE_VEHICLE || (GetTypeId() == TYPEID_UNIT && IsVehicle())); charmer->SetCharm(this, false); @@ -18616,13 +18610,13 @@ void Unit::RemoveCharmedBy(Unit* charmer) playerCharmer->SendRemoveControlBar(); // xinef: Always delete charm info (restores react state) - if (GetTypeId() == TYPEID_PLAYER || (GetTypeId() == TYPEID_UNIT && !ToCreature()->IsGuardian())) + if (IsPlayer() || (GetTypeId() == TYPEID_UNIT && !ToCreature()->IsGuardian())) DeleteCharmInfo(); } void Unit::RestoreFaction() { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->SetFactionForRace(getRace()); else { @@ -18709,14 +18703,14 @@ bool Unit::IsInPartyWith(Unit const* unit) const if (u1 == u2) return true; - if (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER) + if (u1->IsPlayer() && u2->IsPlayer()) return u1->ToPlayer()->IsInSameGroupWith(u2->ToPlayer()); // Xinef: we assume that npcs with the same faction are in party else if (u1->GetTypeId() == TYPEID_UNIT && u2->GetTypeId() == TYPEID_UNIT && !u1->IsControlledByPlayer() && !u2->IsControlledByPlayer()) return u1->GetFaction() == u2->GetFaction(); // Xinef: creature type_flag should work for party check only if player group is not a raid - else if ((u2->GetTypeId() == TYPEID_PLAYER && u1->GetTypeId() == TYPEID_UNIT && (u1->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT) && u2->ToPlayer()->GetGroup() && !u2->ToPlayer()->GetGroup()->isRaidGroup()) || - (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_UNIT && (u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT) && u1->ToPlayer()->GetGroup() && !u1->ToPlayer()->GetGroup()->isRaidGroup())) + else if ((u2->IsPlayer() && u1->GetTypeId() == TYPEID_UNIT && (u1->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT) && u2->ToPlayer()->GetGroup() && !u2->ToPlayer()->GetGroup()->isRaidGroup()) || + (u1->IsPlayer() && u2->GetTypeId() == TYPEID_UNIT && (u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT) && u1->ToPlayer()->GetGroup() && !u1->ToPlayer()->GetGroup()->isRaidGroup())) return true; else return false; @@ -18732,13 +18726,13 @@ bool Unit::IsInRaidWith(Unit const* unit) const if (u1 == u2) return true; - if (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER) + if (u1->IsPlayer() && u2->IsPlayer()) return u1->ToPlayer()->IsInSameRaidWith(u2->ToPlayer()); // Xinef: we assume that npcs with the same faction are in party else if (u1->GetTypeId() == TYPEID_UNIT && u2->GetTypeId() == TYPEID_UNIT && !u1->IsControlledByPlayer() && !u2->IsControlledByPlayer()) return u1->GetFaction() == u2->GetFaction(); - else if ((u2->GetTypeId() == TYPEID_PLAYER && u1->GetTypeId() == TYPEID_UNIT && u1->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT) || - (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_UNIT && u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT)) + else if ((u2->IsPlayer() && u1->GetTypeId() == TYPEID_UNIT && u1->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT) || + (u1->IsPlayer() && u2->GetTypeId() == TYPEID_UNIT && u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT)) return true; else return false; @@ -18748,7 +18742,7 @@ void Unit::GetPartyMembers(std::list& TagUnitMap) { Unit* owner = GetCharmerOrOwnerOrSelf(); Group* group = nullptr; - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) group = owner->ToPlayer()->GetGroup(); if (group) @@ -18871,12 +18865,12 @@ void Unit::ApplyResilience(Unit const* victim, float* crit, int32* damage, bool return; Unit const* target = nullptr; - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) target = victim; else if (victim->GetTypeId() == TYPEID_UNIT) { if (Unit* owner = victim->GetOwner()) - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) target = owner; } @@ -18945,7 +18939,7 @@ float Unit::MeleeSpellMissChance(Unit const* victim, WeaponAttackType attType, i // bonus from skills is 0.04% //miss_chance -= skillDiff * 0.04f; int32 diff = -skillDiff; - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) missChance += diff > 0 ? diff * 0.04f : diff * 0.02f; else missChance += diff > 10 ? 1 + (diff - 10) * 0.4f : diff * 0.1f; @@ -19150,7 +19144,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const break; } - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { switch (form) { @@ -19514,7 +19508,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId) SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(itr->second.spellId); // xinef: dont allow players to enter vehicles on arena - if (spellInfo->HasAura(SPELL_AURA_CONTROL_VEHICLE) && caster->GetTypeId() == TYPEID_PLAYER && caster->FindMap() && caster->FindMap()->IsBattleArena()) + if (spellInfo->HasAura(SPELL_AURA_CONTROL_VEHICLE) && caster->IsPlayer() && caster->FindMap() && caster->FindMap()->IsBattleArena()) continue; if (seatId > -1) @@ -19611,7 +19605,7 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a if (Player* player = ToPlayer()) { - if (vehicle->GetBase()->GetTypeId() == TYPEID_PLAYER && player->IsInCombat()) + if (vehicle->GetBase()->IsPlayer() && player->IsInCombat()) return; sScriptMgr->AnticheatSetUnderACKmount(player); @@ -19926,7 +19920,7 @@ void Unit::NearTeleportTo(Position& pos, bool casting /*= false*/, bool vehicleT void Unit::NearTeleportTo(float x, float y, float z, float orientation, bool casting /*= false*/, bool vehicleTeleport /*= false*/, bool withPet /*= false*/, bool removeTransport /*= false*/) { DisableSpline(); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->TeleportTo(GetMapId(), x, y, z, orientation, TELE_TO_NOT_LEAVE_COMBAT | (removeTransport ? 0 : TELE_TO_NOT_LEAVE_TRANSPORT) | TELE_TO_NOT_UNSUMMON_PET | (casting ? TELE_TO_SPELL : 0) | (vehicleTeleport ? TELE_TO_NOT_LEAVE_VEHICLE : 0) | (withPet ? TELE_TO_WITH_PET : 0)); else { @@ -19950,7 +19944,7 @@ void Unit::SendTeleportPacket(Position& pos) Position oldPos = { GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation() }; if (GetTypeId() == TYPEID_UNIT) Relocate(&pos); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { ToPlayer()->SetCanTeleport(true); } @@ -19959,7 +19953,7 @@ void Unit::SendTeleportPacket(Position& pos) BuildMovementPacket(&data2); if (GetTypeId() == TYPEID_UNIT) Relocate(&oldPos); - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) Relocate(&pos); SendMessageToSet(&data2, false); } @@ -19985,7 +19979,7 @@ bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool tel if (relocated) { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) GetMap()->PlayerRelocation(ToPlayer(), x, y, z, orientation); else GetMap()->CreatureRelocation(ToCreature(), x, y, z, orientation); @@ -19994,7 +19988,7 @@ bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool tel { UpdateOrientation(orientation); - if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->GetFarSightDistance()) + if (IsPlayer() && ToPlayer()->GetFarSightDistance()) UpdateObjectVisibility(false); } @@ -20117,7 +20111,7 @@ void Unit::StopAttackFaction(uint32 faction_id) InterruptNonMeleeSpells(false); // melee and ranged forced attack cancel - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) ToPlayer()->SendAttackSwingCancelAttack(); } } @@ -20149,7 +20143,7 @@ void Unit::StopAttackingInvalidTarget() if (!attacker->IsValidAttackTarget(this)) { attacker->AttackStop(); - if (attacker->GetTypeId() == TYPEID_PLAYER) + if (attacker->IsPlayer()) { attacker->ToPlayer()->SendAttackSwingCancelAttack(); } @@ -20871,7 +20865,7 @@ void Unit::PatchValuesUpdate(ByteBuffer& valuesUpdateBuf, BuildValuesCachePosPoi valuesUpdateBuf.put(posPointers.UnitFieldBytes2Pos, (m_uint32Values[UNIT_FIELD_BYTES_2] & ((UNIT_BYTE2_FLAG_SANCTUARY /*| UNIT_BYTE2_FLAG_AURAS | UNIT_BYTE2_FLAG_UNK5*/) << 8))); // this flag is at uint8 offset 1 !! }// pussywizard / Callmephil else if (target->IsSpectator() && target->FindMap() && target->FindMap()->IsBattleArena() && - (this->GetTypeId() == TYPEID_PLAYER || this->GetTypeId() == TYPEID_UNIT || this->GetTypeId() == TYPEID_DYNAMICOBJECT)) + (this->IsPlayer() || this->GetTypeId() == TYPEID_UNIT || this->IsDynamicObject())) { valuesUpdateBuf.put(posPointers.UnitFieldBytes2Pos, (m_uint32Values[UNIT_FIELD_BYTES_2] & 0xFFFFF2FF)); // clear UNIT_BYTE2_FLAG_PVP, UNIT_BYTE2_FLAG_FFA_PVP, UNIT_BYTE2_FLAG_SANCTUARY } @@ -20889,7 +20883,7 @@ void Unit::PatchValuesUpdate(ByteBuffer& valuesUpdateBuf, BuildValuesCachePosPoi valuesUpdateBuf.put(posPointers.UnitFieldFactionTemplatePos, uint32(target->GetFaction())); }// pussywizard / Callmephil else if (target->IsSpectator() && target->FindMap() && target->FindMap()->IsBattleArena() && - (this->GetTypeId() == TYPEID_PLAYER || this->GetTypeId() == TYPEID_UNIT || this->GetTypeId() == TYPEID_DYNAMICOBJECT)) + (this->IsPlayer() || this->GetTypeId() == TYPEID_UNIT || this->IsDynamicObject())) { valuesUpdateBuf.put(posPointers.UnitFieldFactionTemplatePos, uint32(target->GetFaction())); } @@ -20921,7 +20915,7 @@ void Unit::BuildCooldownPacket(WorldPacket& data, uint8 flags, PacketCooldowns c uint8 Unit::getRace(bool original) const { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) { if (original) return m_realRace; @@ -20934,7 +20928,7 @@ uint8 Unit::getRace(bool original) const void Unit::setRace(uint8 race) { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) m_race = race; } @@ -20978,7 +20972,7 @@ bool Unit::IsInCombatWith(Unit const* who) const */ float Unit::GetCollisionWidth() const { - if (GetTypeId() == TYPEID_PLAYER) + if (IsPlayer()) return GetObjectSize(); float scaleMod = GetObjectScale(); // 99% sure about this diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 313427813..22952cd67 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -82,7 +82,7 @@ void Vehicle::Install() void Vehicle::InstallAllAccessories(bool evading) { - if (GetBase()->GetTypeId() == TYPEID_PLAYER || !evading) + if (GetBase()->IsPlayer() || !evading) RemoveAllPassengers(); // We might have aura's saved in the DB with now invalid casters - remove VehicleAccessoryList const* accessories = sObjectMgr->GetVehicleAccessoryList(this); @@ -116,7 +116,7 @@ void Vehicle::Uninstall() void Vehicle::Reset(bool evading /*= false*/) { LOG_DEBUG("vehicles", "Vehicle::Reset: {}", _me->GetGUID().ToString()); - if (_me->GetTypeId() == TYPEID_PLAYER) + if (_me->IsPlayer()) { if (_usableSeatNum) _me->SetNpcFlag(UNIT_NPC_FLAG_PLAYER_VEHICLE); @@ -357,7 +357,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) --_usableSeatNum; if (!_usableSeatNum) { - if (_me->GetTypeId() == TYPEID_PLAYER) + if (_me->IsPlayer()) _me->RemoveNpcFlag(UNIT_NPC_FLAG_PLAYER_VEHICLE); else _me->RemoveNpcFlag(UNIT_NPC_FLAG_SPELLCLICK); @@ -368,7 +368,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) return false; // Xinef: moved from unit.cpp, if aura passes seatId == -1 (choose automaticly) we wont get appropriate flags - if (unit->GetTypeId() == TYPEID_PLAYER && !(seat->second.SeatInfo->m_flagsB & VEHICLE_SEAT_FLAG_B_KEEP_PET)) + if (unit->IsPlayer() && !(seat->second.SeatInfo->m_flagsB & VEHICLE_SEAT_FLAG_B_KEEP_PET)) unit->ToPlayer()->UnsummonPetTemporaryIfAny(); if (seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_PASSENGER_NOT_SELECTABLE) @@ -383,7 +383,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) // xinef: removed seat->first == 0 check... if (_me->GetTypeId() == TYPEID_UNIT - && unit->GetTypeId() == TYPEID_PLAYER + && unit->IsPlayer() && seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL) { // Removed try catch + ABORT() here, and make it as simple condition check. @@ -460,7 +460,7 @@ void Vehicle::RemovePassenger(Unit* unit) unit->GetName(), _me->GetEntry(), _vehicleInfo->m_ID, _me->GetGUID().ToString(), (int32)seat->first); if (seat->second.SeatInfo->CanEnterOrExit() && ++_usableSeatNum) - _me->SetNpcFlag((_me->GetTypeId() == TYPEID_PLAYER ? UNIT_NPC_FLAG_PLAYER_VEHICLE : UNIT_NPC_FLAG_SPELLCLICK)); + _me->SetNpcFlag((_me->IsPlayer() ? UNIT_NPC_FLAG_PLAYER_VEHICLE : UNIT_NPC_FLAG_SPELLCLICK)); // Remove UNIT_FLAG_NOT_SELECTABLE if passenger did not have it before entering vehicle if (seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_PASSENGER_NOT_SELECTABLE && !seat->second.Passenger.IsUnselectable) @@ -468,7 +468,7 @@ void Vehicle::RemovePassenger(Unit* unit) seat->second.Passenger.Reset(); - if (_me->GetTypeId() == TYPEID_UNIT && unit->GetTypeId() == TYPEID_PLAYER && seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL) + if (_me->GetTypeId() == TYPEID_UNIT && unit->IsPlayer() && seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL) _me->RemoveCharmedBy(unit); if (_me->IsInWorld()) @@ -483,7 +483,7 @@ void Vehicle::RemovePassenger(Unit* unit) } // only for flyable vehicles - if (_me->IsFlying() && !_me->GetInstanceId() && unit->GetTypeId() == TYPEID_PLAYER && !(unit->ToPlayer()->GetDelayedOperations() & DELAYED_VEHICLE_TELEPORT) && _me->GetEntry() != 30275 /*NPC_WILD_WYRM*/) + if (_me->IsFlying() && !_me->GetInstanceId() && unit->IsPlayer() && !(unit->ToPlayer()->GetDelayedOperations() & DELAYED_VEHICLE_TELEPORT) && _me->GetEntry() != 30275 /*NPC_WILD_WYRM*/) _me->CastSpell(unit, VEHICLE_SPELL_PARACHUTE, true); if (_me->GetTypeId() == TYPEID_UNIT) @@ -533,7 +533,7 @@ bool Vehicle::IsVehicleInUse() for (SeatMap::const_iterator itr = Seats.begin(); itr != Seats.end(); ++itr) if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), itr->second.Passenger.Guid)) { - if (passenger->GetTypeId() == TYPEID_PLAYER) + if (passenger->IsPlayer()) return true; else if (passenger->GetTypeId() == TYPEID_UNIT && passenger->GetVehicleKit() && passenger->GetVehicleKit()->IsVehicleInUse()) return true; @@ -550,7 +550,7 @@ void Vehicle::TeleportVehicle(float x, float y, float z, float ang) for (SeatMap::const_iterator itr = Seats.begin(); itr != Seats.end(); ++itr) if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), itr->second.Passenger.Guid)) { - if (passenger->GetTypeId() == TYPEID_PLAYER) + if (passenger->IsPlayer()) { passenger->ToPlayer()->SetMover(passenger); passenger->NearTeleportTo(x, y, z, ang, false, true); diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index c169769a8..19d8b6818 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -146,7 +146,7 @@ Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const& p, ObjectGuid con switch (guid.GetHigh()) { case HighGuid::Item: - if (typemask & TYPEMASK_ITEM && p.GetTypeId() == TYPEID_PLAYER) + if (typemask & TYPEMASK_ITEM && p.IsPlayer()) return ((Player const&)p).GetItemByGuid(guid); break; case HighGuid::Player: diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 42661e934..bfbf028d7 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -159,7 +159,7 @@ inline void CreatureUnitRelocationWorker(Creature* c, Unit* u) { c->AI()->MoveInLineOfSight_Safe(u); } - else if (u->GetTypeId() == TYPEID_PLAYER && u->HasStealthAura() && c->IsAIEnabled && c->CanSeeOrDetect(u, false, true, true)) + else if (u->IsPlayer() && u->HasStealthAura() && c->IsAIEnabled && c->CanSeeOrDetect(u, false, true, true)) { c->AI()->TriggerAlert(u); } diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 9d6b36a0b..d3e1e89b2 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -107,7 +107,7 @@ namespace Acore bool required3dDist; MessageDistDeliverer(WorldObject const* src, WorldPacket const* msg, float dist, bool own_team_only = false, Player const* skipped = nullptr, bool req3dDist = false) : i_source(src), i_message(msg), i_phaseMask(src->GetPhaseMask()), i_distSq(dist * dist) - , teamId((own_team_only && src->GetTypeId() == TYPEID_PLAYER) ? src->ToPlayer()->GetTeamId() : TEAM_NEUTRAL) + , teamId((own_team_only && src->IsPlayer()) ? src->ToPlayer()->GetTeamId() : TEAM_NEUTRAL) , skipped_receiver(skipped), required3dDist(req3dDist) { } @@ -978,7 +978,7 @@ namespace Acore AnyFriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool playerOnly = false) : i_obj(obj), i_funit(funit), i_range(range), i_playerOnly(playerOnly) {} bool operator()(Unit* u) { - if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_funit->IsFriendlyTo(u) && (!i_playerOnly || u->GetTypeId() == TYPEID_PLAYER)) + if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_funit->IsFriendlyTo(u) && (!i_playerOnly || u->IsPlayer())) return true; else return false; @@ -996,7 +996,7 @@ namespace Acore AnyFriendlyNotSelfUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool playerOnly = false) : i_obj(obj), i_funit(funit), i_range(range), i_playerOnly(playerOnly) {} bool operator()(Unit* u) { - if (u != i_obj && u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_funit->IsFriendlyTo(u) && (!i_playerOnly || u->GetTypeId() == TYPEID_PLAYER)) + if (u != i_obj && u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_funit->IsFriendlyTo(u) && (!i_playerOnly || u->IsPlayer())) return true; else return false; @@ -1083,8 +1083,8 @@ namespace Acore Unit const* owner = i_funit->GetOwner(); if (owner) check = owner; - i_targetForPlayer = (check->GetTypeId() == TYPEID_PLAYER); - if (i_obj->GetTypeId() == TYPEID_DYNAMICOBJECT) + i_targetForPlayer = (check->IsPlayer()); + if (i_obj->IsDynamicObject()) _spellInfo = sSpellMgr->GetSpellInfo(((DynamicObject*)i_obj)->GetSpellId()); } bool operator()(Unit* u) @@ -1104,7 +1104,8 @@ namespace Acore } - if (i_funit->_IsValidAttackTarget(u, _spellInfo, i_obj->GetTypeId() == TYPEID_DYNAMICOBJECT ? i_obj : nullptr) && i_obj->IsWithinDistInMap(u, i_range,true,false)) + if (i_funit->_IsValidAttackTarget(u, _spellInfo, i_obj->IsDynamicObject() ? i_obj : nullptr) && i_obj->IsWithinDistInMap(u, i_range,true,false)) + return true; return false; @@ -1487,7 +1488,7 @@ namespace Acore } Player* player = nullptr; - if (u->GetTypeId() == TYPEID_PLAYER) + if (u->IsPlayer()) { player = u->ToPlayer(); } diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 2f313c701..8368c8723 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -92,7 +92,7 @@ void WorldSession::HandlePetAction(WorldPacket& recvData) } // Xinef: allow to controll players - if (pet->GetTypeId() == TYPEID_PLAYER && flag != ACT_COMMAND && flag != ACT_REACTION) + if (pet->IsPlayer() && flag != ACT_COMMAND && flag != ACT_REACTION) return; // Do not follow itself vehicle @@ -355,13 +355,6 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe return; } - // Clear the flags as if owner clicked 'attack'. AI will reset them - // after AttackStart, even if spell failed - charmInfo->SetIsAtStay(false); - charmInfo->SetIsCommandAttack(true); - charmInfo->SetIsReturning(false); - charmInfo->SetIsFollowing(false); - TriggerCastFlags triggerCastFlags = TRIGGERED_NONE; if (spellInfo->IsPassive()) @@ -394,17 +387,17 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe if (unit_target) { pet->SetInFront(unit_target); - if (unit_target->GetTypeId() == TYPEID_PLAYER) + if (unit_target->IsPlayer()) pet->SendUpdateToPlayer(unit_target->ToPlayer()); } else if (Unit* unit_target2 = spell->m_targets.GetUnitTarget()) { pet->SetInFront(unit_target2); - if (unit_target2->GetTypeId() == TYPEID_PLAYER) + if (unit_target2->IsPlayer()) pet->SendUpdateToPlayer(unit_target2->ToPlayer()); } if (Unit* powner = pet->GetCharmerOrOwner()) - if (powner->GetTypeId() == TYPEID_PLAYER) + if (powner->IsPlayer()) pet->SendUpdateToPlayer(powner->ToPlayer()); result = SPELL_CAST_OK; @@ -860,7 +853,7 @@ void WorldSession::HandlePetRename(WorldPacket& recvData) pet->SetName(name); Unit* owner = pet->GetOwner(); - if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && owner->ToPlayer()->GetGroup()) + if (owner && (owner->IsPlayer()) && owner->ToPlayer()->GetGroup()) owner->ToPlayer()->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_NAME); pet->RemoveByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED); @@ -1072,7 +1065,7 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket) if (!caster->GetCharmInfo() || !caster->GetCharmInfo()->GetForcedSpell()) spell->SendPetCastResult(result); - if (caster->GetTypeId() == TYPEID_PLAYER) + if (caster->IsPlayer()) { if (!caster->ToPlayer()->HasSpellCooldown(spellId)) GetPlayer()->SendClearCooldown(spellId, caster); diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 5d03deda1..120424711 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -124,7 +124,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket& recvData) // no or incorrect quest giver if (!object || object == _player || (object->GetTypeId() != TYPEID_PLAYER && !object->hasQuest(questId)) || - (object->GetTypeId() == TYPEID_PLAYER && !object->ToPlayer()->CanShareQuest(questId))) + (object->IsPlayer() && !object->ToPlayer()->CanShareQuest(questId))) { _player->PlayerTalkClass->SendCloseGossip(); _player->SetDivider(); @@ -138,7 +138,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket& recvData) if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId)) { // pussywizard: exploit fix, can't share quests that give items to be sold - if (object->GetTypeId() == TYPEID_PLAYER) + if (object->IsPlayer()) if (uint32 itemId = quest->GetSrcItemId()) if (ItemTemplate const* srcItem = sObjectMgr->GetItemTemplate(itemId)) if (srcItem->SellPrice > 0) @@ -220,7 +220,7 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode(WorldPacket& recvData) if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId)) { // not sure here what should happen to quests with QUEST_FLAGS_AUTOCOMPLETE - // if this breaks them, add && object->GetTypeId() == TYPEID_ITEM to this check + // if this breaks them, add && object->IsItem() to this check // item-started quests never have that flag if (!_player->CanTakeQuest(quest, true)) return; diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index b9745d3d7..e09e8033b 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -351,7 +351,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) // ignore for remote control state (for player case) Unit* mover = _player->m_mover; - if (mover != _player && mover->GetTypeId() == TYPEID_PLAYER) + if (mover != _player && mover->IsPlayer()) { recvPacket.rfinish(); // prevent spam at ignore packet return; @@ -372,7 +372,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) HandleClientCastFlags(recvPacket, castFlags, targets); // not have spell in spellbook - if (mover->GetTypeId() == TYPEID_PLAYER) + if (mover->IsPlayer()) { // not have spell in spellbook or spell passive and not casted by client if( !(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!mover->ToPlayer()->HasActiveSpell(spellId) || spellInfo->IsPassive()) ) @@ -688,7 +688,7 @@ void WorldSession::HandleMirrorImageDataRequest(WorldPacket& recvData) data << uint8(creator->getGender()); data << uint8(creator->getClass()); - if (creator->GetTypeId() == TYPEID_PLAYER) + if (creator->IsPlayer()) { Player* player = creator->ToPlayer(); data << uint8(player->GetByteValue(PLAYER_BYTES, 0)); // skin diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index b76bc49b9..b44069a32 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -70,7 +70,7 @@ Map::~Map() WorldObject* obj = *i_worldObjects.begin(); ASSERT(obj->IsWorldObject()); LOG_DEBUG("maps", "Map::~Map: WorldObject TypeId is not a corpse! ({})", static_cast(obj->GetTypeId())); - //ASSERT(obj->GetTypeId() == TYPEID_CORPSE); + //ASSERT(obj->IsCorpse()); obj->RemoveFromWorld(); obj->ResetMap(); } diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 5bffcdba9..002a933c2 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -269,7 +269,7 @@ void MotionMaster::MoveTargetedHome(bool walk /*= false*/) Unit* target = _owner->ToCreature()->GetCharmerOrOwner(); if (target) { - LOG_DEBUG("movement.motionmaster", "Following {} ({})", target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetGUID().ToString()); + LOG_DEBUG("movement.motionmaster", "Following {} ({})", target->IsPlayer() ? "player" : "creature", target->GetGUID().ToString()); Mutate(new FollowMovementGenerator(target, PET_FOLLOW_DIST, _owner->GetFollowAngle(),true), MOTION_SLOT_ACTIVE); } } @@ -285,7 +285,7 @@ void MotionMaster::MoveConfused() if (_owner->HasUnitFlag(UNIT_FLAG_DISABLE_MOVE)) return; - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { LOG_DEBUG("movement.motionmaster", "Player ({}) move confused", _owner->GetGUID().ToString()); Mutate(new ConfusedMovementGenerator(), MOTION_SLOT_CONTROLLED); @@ -305,16 +305,16 @@ void MotionMaster::MoveChase(Unit* target, std::optional dist, std: return; //_owner->ClearUnitState(UNIT_STATE_FOLLOW); - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { LOG_DEBUG("movement.motionmaster", "Player ({}) chase to {} ({})", - _owner->GetGUID().ToString(), target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetGUID().ToString()); + _owner->GetGUID().ToString(), target->IsPlayer() ? "player" : "creature", target->GetGUID().ToString()); Mutate(new ChaseMovementGenerator(target, dist, angle), MOTION_SLOT_ACTIVE); } else { LOG_DEBUG("movement.motionmaster", "Creature ({}) chase to {} ({})", - _owner->GetGUID().ToString(), target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetGUID().ToString()); + _owner->GetGUID().ToString(), target->IsPlayer() ? "player" : "creature", target->GetGUID().ToString()); Mutate(new ChaseMovementGenerator(target, dist, angle), MOTION_SLOT_ACTIVE); } } @@ -401,16 +401,16 @@ void MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlo } //_owner->AddUnitState(UNIT_STATE_FOLLOW); - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { LOG_DEBUG("movement.motionmaster", "Player ({}) follow to {} ({})", - _owner->GetGUID().ToString(), target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetGUID().ToString()); + _owner->GetGUID().ToString(), target->IsPlayer() ? "player" : "creature", target->GetGUID().ToString()); Mutate(new FollowMovementGenerator(target, dist, angle, inheritWalkState), slot); } else { LOG_DEBUG("movement.motionmaster", "Creature ({}) follow to {} ({})", - _owner->GetGUID().ToString(), target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetGUID().ToString()); + _owner->GetGUID().ToString(), target->IsPlayer() ? "player" : "creature", target->GetGUID().ToString()); Mutate(new FollowMovementGenerator(target, dist, angle, inheritWalkState), slot); } } @@ -421,7 +421,7 @@ void MotionMaster::MovePoint(uint32 id, float x, float y, float z, bool generate if (_owner->HasUnitFlag(UNIT_FLAG_DISABLE_MOVE)) return; - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { LOG_DEBUG("movement.motionmaster", "Player ({}) targeted point (Id: {} X: {} Y: {} Z: {})", _owner->GetGUID().ToString(), id, x, y, z); Mutate(new PointMovementGenerator(id, x, y, z, 0.0f, orientation, nullptr, generatePath, forceDestination), slot); @@ -439,7 +439,7 @@ void MotionMaster::MoveSplinePath(Movement::PointsArray* path) if (_owner->HasUnitFlag(UNIT_FLAG_DISABLE_MOVE)) return; - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { Mutate(new EscortMovementGenerator(path), MOTION_SLOT_ACTIVE); } @@ -527,7 +527,7 @@ void MotionMaster::MoveTakeoff(uint32 id, float x, float y, float z, float speed void MotionMaster::MoveKnockbackFrom(float srcX, float srcY, float speedXY, float speedZ) { //this function may make players fall below map - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) return; if (speedXY <= 0.1f) @@ -553,7 +553,7 @@ void MotionMaster::MoveKnockbackFrom(float srcX, float srcY, float speedXY, floa void MotionMaster::MoveJumpTo(float angle, float speedXY, float speedZ) { //this function may make players fall below map - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) return; float x, y, z; @@ -603,7 +603,7 @@ void MotionMaster::MoveFall(uint32 id /*=0*/, bool addFlagForNPC) if (std::fabs(_owner->GetPositionZ() - tz) < 0.1f) return; - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { _owner->AddUnitMovementFlag(MOVEMENTFLAG_FALLING); _owner->m_movementInfo.SetFallTime(0); @@ -634,7 +634,7 @@ void MotionMaster::MoveCharge(float x, float y, float z, float speed, uint32 id, if (Impl[MOTION_SLOT_CONTROLLED] && Impl[MOTION_SLOT_CONTROLLED]->GetMovementGeneratorType() != DISTRACT_MOTION_TYPE) return; - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { LOG_DEBUG("movement.motionmaster", "Player ({}) charge point (X: {} Y: {} Z: {})", _owner->GetGUID().ToString(), x, y, z); Mutate(new PointMovementGenerator(id, x, y, z, speed, orientation, path, generatePath, generatePath, targetGUID), MOTION_SLOT_CONTROLLED); @@ -665,7 +665,7 @@ void MotionMaster::MoveSeekAssistance(float x, float y, float z) if (_owner->HasUnitFlag(UNIT_FLAG_DISABLE_MOVE)) return; - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { LOG_ERROR("movement.motionmaster", "Player ({}) attempt to seek assistance", _owner->GetGUID().ToString()); } @@ -685,7 +685,7 @@ void MotionMaster::MoveSeekAssistanceDistract(uint32 time) if (_owner->HasUnitFlag(UNIT_FLAG_DISABLE_MOVE)) return; - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { LOG_ERROR("movement.motionmaster", "Player ({}) attempt to call distract after assistance", _owner->GetGUID().ToString()); } @@ -705,16 +705,16 @@ void MotionMaster::MoveFleeing(Unit* enemy, uint32 time) if (_owner->HasUnitFlag(UNIT_FLAG_DISABLE_MOVE)) return; - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { LOG_DEBUG("movement.motionmaster", "Player ({}) flee from {} ({})", - _owner->GetGUID().ToString(), enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", enemy->GetGUID().ToString()); + _owner->GetGUID().ToString(), enemy->IsPlayer() ? "player" : "creature", enemy->GetGUID().ToString()); Mutate(new FleeingMovementGenerator(enemy->GetGUID()), MOTION_SLOT_CONTROLLED); } else { LOG_DEBUG("movement.motionmaster", "Creature ({}) flee from {} ({}) {}", - _owner->GetGUID().ToString(), enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", enemy->GetGUID().ToString(), time ? " for a limited time" : ""); + _owner->GetGUID().ToString(), enemy->IsPlayer() ? "player" : "creature", enemy->GetGUID().ToString(), time ? " for a limited time" : ""); if (time) Mutate(new TimedFleeingMovementGenerator(enemy->GetGUID(), time), MOTION_SLOT_CONTROLLED); else @@ -724,7 +724,7 @@ void MotionMaster::MoveFleeing(Unit* enemy, uint32 time) void MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode) { - if (_owner->GetTypeId() == TYPEID_PLAYER) + if (_owner->IsPlayer()) { if (path < sTaxiPathNodesByPath.size()) { @@ -754,7 +754,7 @@ void MotionMaster::MoveDistract(uint32 timer) if (_owner->HasUnitFlag(UNIT_FLAG_DISABLE_MOVE)) return; - /*if (_owner->GetTypeId() == TYPEID_PLAYER) + /*if (_owner->IsPlayer()) { LOG_DEBUG("movement.motionmaster", "Player ({}) distracted (timer: {})", _owner->GetGUID().ToString(), timer); } @@ -817,12 +817,12 @@ void MotionMaster::MovePath(uint32 path_id, bool repeatable) delete curr; }*/ - //_owner->GetTypeId() == TYPEID_PLAYER ? + //_owner->IsPlayer() ? //Mutate(new WaypointMovementGenerator(path_id, repeatable)): Mutate(new WaypointMovementGenerator(path_id, repeatable), MOTION_SLOT_IDLE); LOG_DEBUG("movement.motionmaster", "{} ({}) start moving over path(Id:{}, repeatable: {})", - _owner->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature", _owner->GetGUID().ToString(), path_id, repeatable ? "YES" : "NO"); + _owner->IsPlayer() ? "Player" : "Creature", _owner->GetGUID().ToString(), path_id, repeatable ? "YES" : "NO"); } void MotionMaster::MoveRotate(uint32 time, RotateDirection direction) diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index a2ef923f6..015f93650 100644 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -85,7 +85,7 @@ bool ChaseMovementGenerator::DoUpdate(T* owner, uint32 time_diff) bool forceDest = //(cOwner && (cOwner->isWorldBoss() || cOwner->IsDungeonBoss())) || // force for all bosses, even not in instances - (i_target->GetTypeId() == TYPEID_PLAYER && i_target->ToPlayer()->IsGameMaster()) || // for .npc follow + (i_target->IsPlayer() && i_target->ToPlayer()->IsGameMaster()) || // for .npc follow (owner->CanFly()) ; // closes "bool forceDest", that way it is more appropriate, so we can comment out crap whenever we need to @@ -452,11 +452,11 @@ bool FollowMovementGenerator::DoUpdate(T* owner, uint32 time_diff) bool forceDest = (followingMaster) || // allow pets following their master to cheat while generating paths - (i_target->GetTypeId() == TYPEID_PLAYER && i_target->ToPlayer()->IsGameMaster()) // for .npc follow + (i_target->IsPlayer() && i_target->ToPlayer()->IsGameMaster()) // for .npc follow ; // closes "bool forceDest", that way it is more appropriate, so we can comment out crap whenever we need to bool targetIsMoving = false; - if (PositionOkay(target, owner->IsGuardian() && target->GetTypeId() == TYPEID_PLAYER, targetIsMoving, time_diff)) + if (PositionOkay(target, owner->IsGuardian() && target->IsPlayer(), targetIsMoving, time_diff)) { if (owner->HasUnitState(UNIT_STATE_FOLLOW_MOVE) && owner->movespline->Finalized()) { diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 2dfc18641..fe945d719 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -40,7 +40,7 @@ void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, O // prepare static data ObjectGuid sourceGUID = source ? source->GetGUID() : ObjectGuid::Empty; //some script commands doesn't have source ObjectGuid targetGUID = target ? target->GetGUID() : ObjectGuid::Empty; - ObjectGuid ownerGUID = (source && source->GetTypeId() == TYPEID_ITEM) ? ((Item*)source)->GetOwnerGUID() : ObjectGuid::Empty; + ObjectGuid ownerGUID = (source && source->IsItem()) ? ((Item*)source)->GetOwnerGUID() : ObjectGuid::Empty; ///- Schedule script execution for all scripts in the script map ScriptMap const* s2 = &(s->second); @@ -75,7 +75,7 @@ void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* sou // prepare static data ObjectGuid sourceGUID = source ? source->GetGUID() : ObjectGuid::Empty; ObjectGuid targetGUID = target ? target->GetGUID() : ObjectGuid::Empty; - ObjectGuid ownerGUID = (source && source->GetTypeId() == TYPEID_ITEM) ? ((Item*)source)->GetOwnerGUID() : ObjectGuid::Empty; + ObjectGuid ownerGUID = (source && source->IsItem()) ? ((Item*)source)->GetOwnerGUID() : ObjectGuid::Empty; ScriptAction sa; sa.sourceGUID = sourceGUID; diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 22738ea99..265a39c79 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -30,9 +30,24 @@ namespace template inline void SCR_CLEAR() { - for (auto const& [scriptID, script] : ScriptRegistry::ScriptPointerList) + for (auto& [scriptID, script] : ScriptRegistry::ScriptPointerList) { - delete script; + try + { + if(script) + { + delete script; + script = nullptr; + } + } + catch (const std::exception& e) + { + LOG_ERROR("scripts.unloading", "Failed to unload script {} with ID: {}. Error: {}", script->GetName(), scriptID, e.what()); + } + catch (...) + { + LOG_ERROR("scripts.unloading", "Failed to unload script {} with ID: {}. Unknown error occurred.", script->GetName(), scriptID); + } } ScriptRegistry::ScriptPointerList.clear(); diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index f4afe7cee..15e75e188 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -38,7 +38,7 @@ public: }; WorldSocketMgr::WorldSocketMgr() : - BaseSocketMgr(), _socketSystemSendBufferSize(-1), _socketApplicationSendBufferSize(65536), _tcpNoDelay(true) + BaseSocketMgr(), _socketSystemSendBufferSize(-1), _socketApplicationSendBufferSize(4096), _tcpNoDelay(true) { } @@ -57,7 +57,7 @@ bool WorldSocketMgr::StartWorldNetwork(Acore::Asio::IoContext& ioContext, std::s // -1 means use default _socketSystemSendBufferSize = sConfigMgr->GetOption("Network.OutKBuff", -1); - _socketApplicationSendBufferSize = sConfigMgr->GetOption("Network.OutUBuff", 65536); + _socketApplicationSendBufferSize = sConfigMgr->GetOption("Network.OutUBuff", 4096); if (_socketApplicationSendBufferSize <= 0) { diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index ac239941e..92a3021a1 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1543,7 +1543,7 @@ void AuraEffect::HandleModInvisibilityDetect(AuraApplication const* aurApp, uint } // call functions which may have additional effects after chainging state of unit - target->UpdateObjectVisibility(target->GetTypeId() == TYPEID_PLAYER || target->GetOwnerGUID().IsPlayer()); + target->UpdateObjectVisibility(target->IsPlayer() || target->GetOwnerGUID().IsPlayer()); } void AuraEffect::HandleModInvisibility(AuraApplication const* aurApp, uint8 mode, bool apply) const @@ -1557,7 +1557,7 @@ void AuraEffect::HandleModInvisibility(AuraApplication const* aurApp, uint8 mode if (apply) { // apply glow vision - if (target->GetTypeId() == TYPEID_PLAYER && (type == INVISIBILITY_GENERAL || type == INVISIBILITY_UNK10)) + if (target->IsPlayer() && (type == INVISIBILITY_GENERAL || type == INVISIBILITY_UNK10)) target->SetByteFlag(PLAYER_FIELD_BYTES2, PLAYER_FIELD_BYTES_2_OFFSET_AURA_VISION, PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW); target->m_invisibility.AddFlag(type); @@ -1569,7 +1569,7 @@ void AuraEffect::HandleModInvisibility(AuraApplication const* aurApp, uint8 mode { // if not have different invisibility auras. // always remove glow vision - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->RemoveByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW); target->m_invisibility.DelFlag(type); @@ -1592,7 +1592,7 @@ void AuraEffect::HandleModInvisibility(AuraApplication const* aurApp, uint8 mode // if not have invisibility auras of type INVISIBILITY_GENERAL // remove glow vision - if (target->GetTypeId() == TYPEID_PLAYER && !target->m_invisibility.HasFlag(INVISIBILITY_GENERAL) && !target->m_invisibility.HasFlag(INVISIBILITY_UNK10)) + if (target->IsPlayer() && !target->m_invisibility.HasFlag(INVISIBILITY_GENERAL) && !target->m_invisibility.HasFlag(INVISIBILITY_UNK10)) { target->RemoveByteFlag(PLAYER_FIELD_BYTES2, PLAYER_FIELD_BYTES_2_OFFSET_AURA_VISION, PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW); } @@ -1609,7 +1609,7 @@ void AuraEffect::HandleModInvisibility(AuraApplication const* aurApp, uint8 mode target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION); } - target->UpdateObjectVisibility(target->GetTypeId() == TYPEID_PLAYER || target->GetOwnerGUID().IsPlayer() || target->GetMap()->Instanceable(), true); + target->UpdateObjectVisibility(target->IsPlayer() || target->GetOwnerGUID().IsPlayer() || target->GetMap()->Instanceable(), true); target->bRequestForcedVisibilityUpdate = false; } @@ -1635,7 +1635,7 @@ void AuraEffect::HandleModStealthDetect(AuraApplication const* aurApp, uint8 mod } // call functions which may have additional effects after chainging state of unit - target->UpdateObjectVisibility(target->GetTypeId() == TYPEID_PLAYER || target->GetOwnerGUID().IsPlayer()); + target->UpdateObjectVisibility(target->IsPlayer() || target->GetOwnerGUID().IsPlayer()); } void AuraEffect::HandleModStealth(AuraApplication const* aurApp, uint8 mode, bool apply) const @@ -1652,7 +1652,7 @@ void AuraEffect::HandleModStealth(AuraApplication const* aurApp, uint8 mode, boo target->m_stealth.AddValue(type, GetAmount()); target->SetStandFlags(UNIT_STAND_FLAGS_CREEP); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->SetByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_STEALTH); // interrupt autoshot @@ -1671,7 +1671,7 @@ void AuraEffect::HandleModStealth(AuraApplication const* aurApp, uint8 mode, boo target->m_stealth.DelFlag(type); target->RemoveStandFlags(UNIT_STAND_FLAGS_CREEP); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->RemoveByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_STEALTH); } } @@ -1683,7 +1683,7 @@ void AuraEffect::HandleModStealth(AuraApplication const* aurApp, uint8 mode, boo target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION); } - target->UpdateObjectVisibility(target->GetTypeId() == TYPEID_PLAYER || target->GetOwnerGUID().IsPlayer() || target->GetMap()->Instanceable(), true); + target->UpdateObjectVisibility(target->IsPlayer() || target->GetOwnerGUID().IsPlayer() || target->GetMap()->Instanceable(), true); target->bRequestForcedVisibilityUpdate = false; } @@ -1701,7 +1701,7 @@ void AuraEffect::HandleModStealthLevel(AuraApplication const* aurApp, uint8 mode target->m_stealth.AddValue(type, -GetAmount()); // call functions which may have additional effects after chainging state of unit - target->UpdateObjectVisibility(target->GetTypeId() == TYPEID_PLAYER || target->GetOwnerGUID().IsPlayer()); + target->UpdateObjectVisibility(target->IsPlayer() || target->GetOwnerGUID().IsPlayer()); } void AuraEffect::HandleDetectAmore(AuraApplication const* aurApp, uint8 mode, bool apply) const @@ -2065,7 +2065,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo Rage_val += aurEff->GetAmount() * 10; } // Stance mastery + Tactical mastery (both passive, and last have aura only in defense stance, but need apply at any stance switch) - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { // Stance mastery - trainer spell PlayerSpellMap const& sp_list = target->ToPlayer()->GetSpellMap(); @@ -2104,7 +2104,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo // add/remove the shapeshift aura's boosts HandleShapeshiftBoosts(target, apply); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->InitDataForForm(); if (target->IsClass(CLASS_DRUID, CLASS_CONTEXT_ABILITY)) @@ -2142,7 +2142,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo if (apply && aurApp->GetRemoveMode()) return; - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { SpellShapeshiftFormEntry const* shapeInfo = sSpellShapeshiftFormStore.LookupEntry(form); // Learn spells for shapeshift form - no need to send action bars or add spells to spellbook @@ -2730,7 +2730,7 @@ void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode, target->setTransForm(GetId()); // polymorph case - if ((mode & AURA_EFFECT_HANDLE_REAL) && target->GetTypeId() == TYPEID_PLAYER && target->IsPolymorphed()) + if ((mode & AURA_EFFECT_HANDLE_REAL) && target->IsPlayer() && target->IsPolymorphed()) { // for players, start regeneration after 1s (in polymorph fast regeneration case) // only if caster is Player (after patch 2.4.2) @@ -2991,7 +2991,7 @@ void AuraEffect::HandleAuraModDisarm(AuraApplication const* aurApp, uint8 mode, target->RemoveFlag(field, flag); // Handle damage modification, shapeshifted druids are not affected - if (target->GetTypeId() == TYPEID_PLAYER && (!target->IsInFeralForm() || target->GetShapeshiftForm() == FORM_GHOSTWOLF)) + if (target->IsPlayer() && (!target->IsInFeralForm() || target->GetShapeshiftForm() == FORM_GHOSTWOLF)) { if (Item* pItem = target->ToPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, slot)) { @@ -3087,7 +3087,7 @@ void AuraEffect::HandleAuraAllowOnlyAbility(AuraApplication const* aurApp, uint8 Unit* target = aurApp->GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { if (apply) target->ToPlayer()->SetPlayerFlag(PLAYER_ALLOW_ONLY_ABILITY); @@ -3174,7 +3174,7 @@ void AuraEffect::HandleAuraModStalked(AuraApplication const* aurApp, uint8 mode, } // call functions which may have additional effects after chainging state of unit - target->UpdateObjectVisibility(target->GetTypeId() == TYPEID_PLAYER); + target->UpdateObjectVisibility(target->IsPlayer()); } void AuraEffect::HandleAuraUntrackable(AuraApplication const* aurApp, uint8 mode, bool apply) const @@ -3366,7 +3366,7 @@ void AuraEffect::HandleAuraFeatherFall(AuraApplication const* aurApp, uint8 mode target->SetFeatherFall(apply); // start fall from current height - if (!apply && target->GetTypeId() == TYPEID_PLAYER) + if (!apply && target->IsPlayer()) target->ToPlayer()->SetFallInformation(GameTime::GetGameTime().count(), target->GetPositionZ()); } @@ -3400,7 +3400,7 @@ void AuraEffect::HandleWaterBreathing(AuraApplication const* aurApp, uint8 mode, Unit* target = aurApp->GetTarget(); // update timers in client - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->UpdateMirrorTimers(); } @@ -3526,7 +3526,7 @@ void AuraEffect::HandlePreventFleeing(AuraApplication const* aurApp, uint8 mode, Unit* target = aurApp->GetTarget(); // Since patch 3.0.2 this mechanic no longer affects fear effects. It will ONLY prevent humanoids from fleeing due to low health. - if (target->GetTypeId() == TYPEID_PLAYER || !apply || target->HasAuraType(SPELL_AURA_MOD_FEAR)) + if (target->IsPlayer() || !apply || target->HasAuraType(SPELL_AURA_MOD_FEAR)) return; /// @todo: find a way to cancel fleeing for assistance. /// Currently this will only stop creatures fleeing due to low health that could not find nearby allies to flee towards. @@ -3733,7 +3733,7 @@ void AuraEffect::HandleAuraModIncreaseFlightSpeed(AuraApplication const* aurApp, if (mode & AURA_EFFECT_HANDLE_REAL) { //Players on flying mounts must be immune to polymorph - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_POLYMORPH, apply); // Dragonmaw Illusion (overwrite mount model, mounted aura already applied) @@ -4327,7 +4327,7 @@ void AuraEffect::HandleAuraModResistanceExclusive(AuraApplication const* aurApp, { float value = float(GetAmount() - amount); target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_VALUE, value, apply); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ApplyResistanceBuffModsMod(SpellSchools(x), aurApp->IsPositive(), value, apply); } } @@ -4346,7 +4346,7 @@ void AuraEffect::HandleAuraModResistance(AuraApplication const* aurApp, uint8 mo if (GetMiscValue() & int32(1 << x)) { target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), TOTAL_VALUE, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER || target->IsPet()) + if (target->IsPlayer() || target->IsPet()) target->ApplyResistanceBuffModsMod(SpellSchools(x), GetAmount() > 0, (float)GetAmount(), apply); } } @@ -4379,7 +4379,7 @@ void AuraEffect::HandleModResistancePercent(AuraApplication const* aurApp, uint8 if (GetMiscValue() & int32(1 << i)) { target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_PCT, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER || target->IsPet()) + if (target->IsPlayer() || target->IsPet()) { target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), true, (float)GetAmount(), apply); target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), false, (float)GetAmount(), apply); @@ -4413,11 +4413,11 @@ void AuraEffect::HandleModTargetResistance(AuraApplication const* aurApp, uint8 // applied to damage as HandleNoImmediateEffect in Unit::CalcAbsorbResist and Unit::CalcArmorReducedDamage // show armor penetration - if (target->GetTypeId() == TYPEID_PLAYER && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)) + if (target->IsPlayer() && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)) target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE, GetAmount(), apply); // show as spell penetration only full spell penetration bonuses (all resistances except armor and holy - if (target->GetTypeId() == TYPEID_PLAYER && (GetMiscValue() & SPELL_SCHOOL_MASK_SPELL) == SPELL_SCHOOL_MASK_SPELL) + if (target->IsPlayer() && (GetMiscValue() & SPELL_SCHOOL_MASK_SPELL) == SPELL_SCHOOL_MASK_SPELL) target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE, GetAmount(), apply); } @@ -4445,7 +4445,7 @@ void AuraEffect::HandleAuraModStat(AuraApplication const* aurApp, uint8 mode, bo { //target->ApplyStatMod(Stats(i), m_amount, apply); target->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_VALUE, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER || target->IsPet()) + if (target->IsPlayer() || target->IsPet()) target->ApplyStatBuffMod(Stats(i), (float)GetAmount(), apply); } } @@ -4575,12 +4575,12 @@ void AuraEffect::HandleModTotalPercentStat(AuraApplication const* aurApp, uint8 { if (i == STAT_STRENGTH || i == STAT_STAMINA) { - if (apply && (target->GetTypeId() == TYPEID_PLAYER || target->IsPet())) + if (apply && (target->IsPlayer() || target->IsPet())) target->ApplyStatPercentBuffMod(Stats(i), value, apply); target->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_PCT, value, apply); - if (!apply && (target->GetTypeId() == TYPEID_PLAYER || target->IsPet())) + if (!apply && (target->IsPlayer() || target->IsPet())) target->ApplyStatPercentBuffMod(Stats(i), value, apply); } } @@ -4591,12 +4591,12 @@ void AuraEffect::HandleModTotalPercentStat(AuraApplication const* aurApp, uint8 { if (GetMiscValue() == i || GetMiscValue() == -1) { - if (apply && (target->GetTypeId() == TYPEID_PLAYER || target->IsPet())) + if (apply && (target->IsPlayer() || target->IsPet())) target->ApplyStatPercentBuffMod(Stats(i), value, apply); target->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_PCT, value, apply); - if (!apply && (target->GetTypeId() == TYPEID_PLAYER || target->IsPet())) + if (!apply && (target->IsPlayer() || target->IsPet())) target->ApplyStatPercentBuffMod(Stats(i), value, apply); } } @@ -4892,7 +4892,7 @@ void AuraEffect::HandleModHitChance(AuraApplication const* aurApp, uint8 mode, b Unit* target = aurApp->GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { target->ToPlayer()->UpdateMeleeHitChances(); target->ToPlayer()->UpdateRangedHitChances(); @@ -4911,7 +4911,7 @@ void AuraEffect::HandleModSpellHitChance(AuraApplication const* aurApp, uint8 mo Unit* target = aurApp->GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->UpdateSpellHitChances(); else target->m_modSpellHitChance += (apply) ? GetAmount() : (-GetAmount()); @@ -4924,7 +4924,7 @@ void AuraEffect::HandleModSpellCritChance(AuraApplication const* aurApp, uint8 m Unit* target = aurApp->GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->UpdateAllSpellCritChances(); else target->m_baseSpellCritChance += (apply) ? GetAmount() : -GetAmount(); @@ -5152,7 +5152,7 @@ void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication con Unit* target = aurApp->GetTarget(); // Recalculate bonus - if (target->GetTypeId() == TYPEID_PLAYER && !(target->getClassMask() & CLASSMASK_WAND_USERS)) + if (target->IsPlayer() && !(target->getClassMask() & CLASSMASK_WAND_USERS)) target->ToPlayer()->UpdateAttackPowerAndDamage(true); } @@ -5169,7 +5169,7 @@ void AuraEffect::HandleAuraModAttackPowerOfArmor(AuraApplication const* aurApp, Unit* target = aurApp->GetTarget(); // Recalculate bonus - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->UpdateAttackPowerAndDamage(false); } /********************************/ @@ -5183,7 +5183,7 @@ void AuraEffect::HandleModDamageDone(AuraApplication const* aurApp, uint8 mode, Unit* target = aurApp->GetTarget(); // apply item specific bonuses for already equipped weapon - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { for (int i = 0; i < MAX_ATTACK; ++i) if (Item* pItem = target->ToPlayer()->GetWeaponForAttack(WeaponAttackType(i), true)) @@ -5208,7 +5208,7 @@ void AuraEffect::HandleModDamageDone(AuraApplication const* aurApp, uint8 mode, target->HandleStatModifier(UNIT_MOD_DAMAGE_OFFHAND, TOTAL_VALUE, float(GetAmount()), apply); target->HandleStatModifier(UNIT_MOD_DAMAGE_RANGED, TOTAL_VALUE, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { if (GetAmount() > 0) target->ApplyModInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS, GetAmount(), apply); @@ -5237,7 +5237,7 @@ void AuraEffect::HandleModDamageDone(AuraApplication const* aurApp, uint8 mode, // Magic damage modifiers implemented in Unit::SpellDamageBonus // This information for client side use only - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { if (GetAmount() > 0) { @@ -5272,7 +5272,7 @@ void AuraEffect::HandleModDamagePercentDone(AuraApplication const* aurApp, uint8 if (!sScriptMgr->CanModAuraEffectModDamagePercentDone(this, target, aurApp, mode, apply)) return; - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { for (int i = 0; i < MAX_ATTACK; ++i) if (Item* item = target->ToPlayer()->GetWeaponForAttack(WeaponAttackType(i), false)) @@ -5285,7 +5285,7 @@ void AuraEffect::HandleModDamagePercentDone(AuraApplication const* aurApp, uint8 target->HandleStatModifier(UNIT_MOD_DAMAGE_OFFHAND, TOTAL_PCT, float(GetAmount()), apply); target->HandleStatModifier(UNIT_MOD_DAMAGE_RANGED, TOTAL_PCT, float(GetAmount()), apply); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->ApplyPercentModFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, float (GetAmount()), apply); } else @@ -5315,7 +5315,7 @@ void AuraEffect::HandleShieldBlockValue(AuraApplication const* aurApp, uint8 mod if (GetAuraType() == SPELL_AURA_MOD_SHIELD_BLOCKVALUE_PCT) modType = PCT_MOD; - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->HandleBaseModValue(SHIELD_BLOCK_VALUE, modType, float(GetAmount()), apply); } @@ -5513,7 +5513,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool target->GetMotionMaster()->MoveFall(); break; case 46699: // Requires No Ammo - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->RemoveAmmo(); // not use ammo and not allow use break; case 71563: @@ -5599,7 +5599,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool { case 2584: // Waiting to Resurrect // Waiting to resurrect spell cancel, we must remove player from resurrect queue - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { if (Battleground* bg = target->ToPlayer()->GetBattleground()) bg->RemovePlayerFromResurrectQueue(target->ToPlayer()); @@ -5646,7 +5646,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if (target->isDead() && GetBase() && target->GetTypeId() == TYPEID_UNIT && target->GetEntry() == 24601) { auto caster2 = GetBase()->GetCaster(); - if (caster2 && caster2->GetTypeId() == TYPEID_PLAYER) + if (caster2 && caster2->IsPlayer()) { caster2->ToPlayer()->KilledMonsterCredit(25987); } @@ -5744,7 +5744,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool } // LK Intro VO (1) case 58204: - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { // Play part 1 if (apply) @@ -5756,7 +5756,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool break; // LK Intro VO (2) case 58205: - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { // Play part 2 if (apply) @@ -5987,13 +5987,13 @@ void AuraEffect::HandleAuraModFaction(AuraApplication const* aurApp, uint8 mode, if (apply) { target->SetFaction(GetMiscValue()); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->RemoveUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); } else { target->RestoreFaction(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->SetUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); } } @@ -6366,7 +6366,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) case 30427: { // move loot to player inventory and despawn target - if (caster && caster->GetTypeId() == TYPEID_PLAYER && + if (caster && caster->IsPlayer() && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->GetCreatureTemplate()->type == CREATURE_TYPE_GAS_CLOUD) { @@ -7134,7 +7134,7 @@ void AuraEffect::HandlePeriodicEnergizeAuraTick(Unit* target, Unit* caster) cons { Powers PowerType = Powers(GetMiscValue()); - if (target->GetTypeId() == TYPEID_PLAYER && !target->HasActivePowerType(PowerType) && !m_spellInfo->HasAttribute(SPELL_ATTR7_ONLY_IN_SPELLBOOK_UNTIL_LEARNED)) + if (target->IsPlayer() && !target->HasActivePowerType(PowerType) && !m_spellInfo->HasAttribute(SPELL_ATTR7_ONLY_IN_SPELLBOOK_UNTIL_LEARNED)) return; if (!target->IsAlive() || !target->GetMaxPower(PowerType)) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index cbaa8b1ec..051c30310 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -486,7 +486,7 @@ AuraObjectType Aura::GetType() const return UNIT_AURA_TYPE; } - return (m_owner->GetTypeId() == TYPEID_DYNAMICOBJECT) ? DYNOBJ_AURA_TYPE : UNIT_AURA_TYPE; + return (m_owner->IsDynamicObject()) ? DYNOBJ_AURA_TYPE : UNIT_AURA_TYPE; } void Aura::_ApplyForTarget(Unit* target, Unit* caster, AuraApplication* auraApp) @@ -559,7 +559,7 @@ void Aura::_UnapplyForTarget(Unit* target, Unit* caster, AuraApplication* auraAp } } - if (caster && caster->GetTypeId() == TYPEID_PLAYER) + if (caster && caster->IsPlayer()) { if (GetSpellInfo()->IsCooldownStartedOnEvent() && !m_castItemGuid) { @@ -1350,7 +1350,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b switch (GetId()) { case 32474: // Buffeting Winds of Susurrus - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->ActivateTaxiPathTo(506, GetId()); break; case 33572: // Gronn Lord's Grasp, becomes stoned @@ -1362,7 +1362,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b target->CastSpell(target, 50812, true); break; case 60970: // Heroic Fury (remove Intercept cooldown) - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->RemoveSpellCooldown(20252, true); break; } @@ -1587,7 +1587,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b break; case SPELLFAMILY_POTION: // Alchemy: Mixology - if (caster && caster->HasAura(53042) && caster->GetTypeId() == TYPEID_PLAYER && !caster->ToPlayer()->GetSession()->PlayerLoading()) + if (caster && caster->HasAura(53042) && caster->IsPlayer() && !caster->ToPlayer()->GetSession()->PlayerLoading()) { if (sSpellMgr->GetSpellGroup(GetId()) == 1) /*Elixirs*/ { @@ -1726,7 +1726,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (Aura const* aura = caster->GetAuraOfRankedSpell(47535)) { // check cooldown - if (caster->GetTypeId() == TYPEID_PLAYER) + if (caster->IsPlayer()) { if (caster->ToPlayer()->HasSpellCooldown(aura->GetId())) { @@ -2266,7 +2266,7 @@ bool Aura::IsProcTriggeredOnEvent(AuraApplication* aurApp, ProcEventInfo& eventI // do that only for passive spells /// @todo: this needs to be unified for all kinds of auras Unit* target = aurApp->GetTarget(); - if (IsPassive() && target->GetTypeId() == TYPEID_PLAYER && GetSpellInfo()->EquippedItemClass != -1) + if (IsPassive() && target->IsPlayer() && GetSpellInfo()->EquippedItemClass != -1) { if (!GetSpellInfo()->HasAttribute(SPELL_ATTR3_NO_PROC_EQUIP_REQUIREMENT)) { diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index e5d8f4a35..2498fe402 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -481,7 +481,7 @@ void SpellCastTargets::Update(Unit* caster) m_objectTarget = m_objectTargetGUID ? ((m_objectTargetGUID == caster->GetGUID()) ? caster : ObjectAccessor::GetWorldObject(*caster, m_objectTargetGUID)) : nullptr; m_itemTarget = nullptr; - if (caster->GetTypeId() == TYPEID_PLAYER) + if (caster->IsPlayer()) { Player* player = caster->ToPlayer(); if (m_targetMask & TARGET_FLAG_ITEM) @@ -609,7 +609,7 @@ Spell::Spell(Unit* caster, SpellInfo const* info, TriggerCastFlags triggerFlags, if (m_attackType == RANGED_ATTACK) // wand case - if ((m_caster->getClassMask() & CLASSMASK_WAND_USERS) != 0 && m_caster->GetTypeId() == TYPEID_PLAYER) + if ((m_caster->getClassMask() & CLASSMASK_WAND_USERS) != 0 && m_caster->IsPlayer()) if (Item* pItem = m_caster->ToPlayer()->GetWeaponForAttack(RANGED_ATTACK)) m_spellSchoolMask = SpellSchoolMask(1 << pItem->GetTemplate()->Damage[0].DamageType); @@ -2031,7 +2031,7 @@ void Spell::SelectEffectTypeImplicitTargets(uint8 effIndex) { case SPELL_EFFECT_SUMMON_RAF_FRIEND: case SPELL_EFFECT_SUMMON_PLAYER: - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->GetTarget()) + if (m_caster->IsPlayer() && m_caster->ToPlayer()->GetTarget()) { WorldObject* target = ObjectAccessor::FindPlayer(m_caster->ToPlayer()->GetTarget()); @@ -2718,7 +2718,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) m_needComboPoints = false; // Restore spell mods for a miss/dodge/parry Cold Blood /// @todo: check how broad this rule should be - if (m_caster->GetTypeId() == TYPEID_PLAYER && (missInfo == SPELL_MISS_MISS || missInfo == SPELL_MISS_DODGE || missInfo == SPELL_MISS_PARRY)) + if (m_caster->IsPlayer() && (missInfo == SPELL_MISS_MISS || missInfo == SPELL_MISS_DODGE || missInfo == SPELL_MISS_PARRY)) m_caster->ToPlayer()->RestoreSpellMods(this, 14177); } @@ -2890,7 +2890,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) Unit::ProcDamageAndSpell(caster, unitTarget, procAttacker, procVictim, procEx, damageInfo.damage, m_attackType, m_spellInfo, m_triggeredByAuraSpell.spellInfo, m_triggeredByAuraSpell.effectIndex, this, &dmgInfo); - if (caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->HasAttribute(SPELL_ATTR0_CANCELS_AUTO_ATTACK_COMBAT) == 0 && + if (caster->IsPlayer() && m_spellInfo->HasAttribute(SPELL_ATTR0_CANCELS_AUTO_ATTACK_COMBAT) == 0 && m_spellInfo->HasAttribute(SPELL_ATTR4_SUPRESS_WEAPON_PROCS) == 0 && (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE || m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED)) caster->ToPlayer()->CastItemCombatSpell(unitTarget, m_attackType, procVictim, procEx); } @@ -2912,7 +2912,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) // Xinef: eg. rogue poisons can proc off cheap shot, etc. so this block should be here also // Xinef: ofc count only spells that HIT the target, little hack used to fool the system - if ((procEx & PROC_EX_NORMAL_HIT || procEx & PROC_EX_CRITICAL_HIT) && caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->HasAttribute(SPELL_ATTR0_CANCELS_AUTO_ATTACK_COMBAT) == 0 && + if ((procEx & PROC_EX_NORMAL_HIT || procEx & PROC_EX_CRITICAL_HIT) && caster->IsPlayer() && m_spellInfo->HasAttribute(SPELL_ATTR0_CANCELS_AUTO_ATTACK_COMBAT) == 0 && m_spellInfo->HasAttribute(SPELL_ATTR4_SUPRESS_WEAPON_PROCS) == 0 && (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE || m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED)) caster->ToPlayer()->CastItemCombatSpell(unitTarget, m_attackType, procVictim | PROC_FLAG_TAKEN_DAMAGE, procEx); } @@ -2985,7 +2985,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) // if target is fallged for pvp also flag caster if a player // xinef: do not flag spells with aura bind sight (no special attribute) if (effectUnit->IsPvP() && effectUnit != m_caster && effectUnit->GetOwnerGUID() != m_caster->GetGUID() && - m_caster->GetTypeId() == TYPEID_PLAYER && !m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NO_PVP_FLAG)) + m_caster->IsPlayer() && !m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NO_PVP_FLAG)) { m_caster->ToPlayer()->UpdatePvP(true); } @@ -3033,14 +3033,14 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA if (!effectMask) return returnVal; - if (unit->GetTypeId() == TYPEID_PLAYER) + if (unit->IsPlayer()) { unit->ToPlayer()->StartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_SPELL_TARGET, m_spellInfo->Id); unit->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, m_spellInfo->Id, 0, m_caster); unit->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, m_spellInfo->Id, 0, m_caster); } - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { m_caster->ToPlayer()->StartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_SPELL_CASTER, m_spellInfo->Id); m_caster->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2, m_spellInfo->Id, 0, unit); @@ -3067,14 +3067,14 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA { // for delayed spells ignore negative spells (after duel end) for friendly targets /// @todo: this cause soul transfer bugged - if(!IsTriggered() && m_spellInfo->Speed > 0.0f && unit->GetTypeId() == TYPEID_PLAYER && !m_spellInfo->IsPositive()) + if(!IsTriggered() && m_spellInfo->Speed > 0.0f && unit->IsPlayer() && !m_spellInfo->IsPositive()) return SPELL_MISS_EVADE; // assisting case, healing and resurrection if (unit->HasUnitState(UNIT_STATE_ATTACK_PLAYER)) { m_caster->SetContestedPvP(); - if (m_caster->GetTypeId() == TYPEID_PLAYER && !m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NO_PVP_FLAG)) + if (m_caster->IsPlayer() && !m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NO_PVP_FLAG)) m_caster->ToPlayer()->UpdatePvP(true); } @@ -3549,7 +3549,7 @@ SpellCastResult Spell::prepare(SpellCastTargets const* targets, AuraEffect const // for example bladestorm aura should be removed on disarm as of patch 3.3.5 // channeled periodic spells should be affected by this (arcane missiles, penance, etc) // a possible alternative sollution for those would be validating aura target on unit state change - if (m_caster->GetTypeId() == TYPEID_PLAYER && triggeredByAura && triggeredByAura->IsPeriodic() && !triggeredByAura->GetBase()->IsPassive()) + if (m_caster->IsPlayer() && triggeredByAura && triggeredByAura->IsPeriodic() && !triggeredByAura->GetBase()->IsPassive()) { SendChannelUpdate(0); triggeredByAura->GetBase()->SetDuration(0); @@ -3571,13 +3571,13 @@ SpellCastResult Spell::prepare(SpellCastTargets const* targets, AuraEffect const // calculate cast time (calculated after first CheckCast check to prevent charge counting for first CheckCast fail) m_casttime = HasTriggeredCastFlag(TRIGGERED_CAST_DIRECTLY) ? 0 : m_spellInfo->CalcCastTime(m_caster, this); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (m_caster->ToPlayer()->GetCommandStatus(CHEAT_CASTTIME)) m_casttime = 0; // don't allow channeled spells / spells with cast time to be casted while moving // (even if they are interrupted on moving, spells with almost immediate effect get to have their effect processed before movement interrupter kicks in) - if ((m_spellInfo->IsChanneled() || m_casttime) && m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->isMoving() && m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT && !IsTriggered()) + if ((m_spellInfo->IsChanneled() || m_casttime) && m_caster->IsPlayer() && m_caster->isMoving() && m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT && !IsTriggered()) { // 1. Has casttime, 2. Or doesn't have flag to allow action during channel if (m_casttime || !m_spellInfo->IsActionAllowedChannel()) @@ -3722,7 +3722,7 @@ void Spell::cancel(bool bySelf) CancelGlobalCooldown(); SendCastResult(SPELL_FAILED_INTERRUPTED); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { if (m_caster->ToPlayer()->NeedSendSpectatorData()) ArenaSpectator::SendCommand_Spell(m_caster->FindMap(), m_caster->GetGUID(), "SPE", m_spellInfo->Id, bySelf ? 99998 : 99999); @@ -3739,15 +3739,14 @@ void Spell::cancel(bool bySelf) if (Unit* unit = m_caster->GetGUID() == ihit->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID)) unit->RemoveOwnedAura(m_spellInfo->Id, m_originalCasterGUID, 0, AURA_REMOVE_BY_CANCEL); - if (m_caster->GetTypeId() == TYPEID_PLAYER) - if (m_spellInfo->HasAttribute(SPELL_ATTR0_COOLDOWN_ON_EVENT)) - m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); + if (m_caster->IsPlayer() && m_spellInfo->IsCooldownStartedOnEvent()) + m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); SendChannelUpdate(0); SendInterrupted(SPELL_FAILED_INTERRUPTED); } - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->NeedSendSpectatorData()) + if (m_caster->IsPlayer() && m_caster->ToPlayer()->NeedSendSpectatorData()) ArenaSpectator::SendCommand_Spell(m_caster->FindMap(), m_caster->GetGUID(), "SPE", m_spellInfo->Id, bySelf ? 99998 : 99999); // spell is canceled-take mods and clear list @@ -3816,7 +3815,7 @@ void Spell::_cast(bool skipCheck) // Xinef: implement attribute SPELL_ATTR1_DISMISS_PET_FIRST, on spell cast current pet is dismissed and charms are removed if (m_spellInfo->HasAttribute(SPELL_ATTR1_DISMISS_PET_FIRST)) { - if (m_caster->GetTypeId() == TYPEID_PLAYER && !m_spellInfo->HasEffect(SPELL_EFFECT_SUMMON_PET)) + if (m_caster->IsPlayer() && !m_spellInfo->HasEffect(SPELL_EFFECT_SUMMON_PET)) if (Pet* pet = m_caster->ToPlayer()->GetPet()) m_caster->ToPlayer()->RemovePet(pet, PET_SAVE_AS_CURRENT); @@ -3869,7 +3868,7 @@ void Spell::_cast(bool skipCheck) // if trade not complete then remember it in trade data if (m_targets.GetTargetMask() & TARGET_FLAG_TRADE_ITEM) { - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { if (TradeData* my_trade = m_caster->ToPlayer()->GetTradeData()) { @@ -3921,7 +3920,7 @@ void Spell::_cast(bool skipCheck) // set to real guid to be sent later to the client m_targets.UpdateTradeSlotItem(); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { if (!HasTriggeredCastFlag(TRIGGERED_IGNORE_CAST_ITEM) && m_CastItem) { @@ -4092,11 +4091,11 @@ void Spell::_cast(bool skipCheck) // xinef: start combat at cast for delayed spells, only for explicit target if (Unit* target = m_targets.GetUnitTarget()) - if (m_caster->GetTypeId() == TYPEID_PLAYER || (m_caster->IsPet() && m_caster->IsControlledByPlayer())) + if (m_caster->IsPlayer() || (m_caster->IsPet() && m_caster->IsControlledByPlayer())) if (GetDelayMoment() > 0 && !m_caster->IsFriendlyTo(target) && !m_spellInfo->HasAura(SPELL_AURA_BIND_SIGHT) && (!m_spellInfo->IsPositive() || m_spellInfo->HasEffect(SPELL_EFFECT_DISPEL))) m_caster->CombatStartOnCast(target, !m_spellInfo->HasAttribute(SPELL_ATTR3_SUPRESS_TARGET_PROCS), GetDelayMoment() + 500); // xinef: increase this time so we dont leave and enter combat in a moment - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (m_caster->ToPlayer()->GetCommandStatus(CHEAT_COOLDOWN)) m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); @@ -4300,7 +4299,7 @@ void Spell::_handle_finish_phase() { // Xinef: Properly clear infinite cooldowns in some cases if (ihit->targetGUID == m_caster->GetGUID() && ihit->missCondition != SPELL_MISS_NONE) - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->IsCooldownStartedOnEvent()) + if (m_caster->IsPlayer() && m_spellInfo->IsCooldownStartedOnEvent()) m_caster->ToPlayer()->SendCooldownEvent(m_spellInfo); } @@ -4408,7 +4407,7 @@ void Spell::update(uint32 difftime) // check if the player caster has moved before the spell finished // xinef: added preparing state (real cast, skip channels as they have other flags for this) - if ((m_caster->GetTypeId() == TYPEID_PLAYER && m_timer != 0) && + if ((m_caster->IsPlayer() && m_timer != 0) && m_caster->isMoving() && (m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT) && m_spellState == SPELL_STATE_PREPARING && (m_spellInfo->Effects[0].Effect != SPELL_EFFECT_STUCK || !m_caster->HasUnitMovementFlag(MOVEMENTFLAG_FALLING_FAR))) { @@ -4486,7 +4485,7 @@ void Spell::finish(bool ok) m_caster->ClearUnitState(UNIT_STATE_CASTING); // Unsummon summon as possessed creatures on spell cancel - if (m_spellInfo->IsChanneled() && m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_spellInfo->IsChanneled() && m_caster->IsPlayer()) { if (Unit* charm = m_caster->GetCharm()) if (charm->GetTypeId() == TYPEID_UNIT @@ -4498,9 +4497,14 @@ void Spell::finish(bool ok) if (Creature* creatureCaster = m_caster->ToCreature()) creatureCaster->ReleaseFocus(this); - if (!ok) + if (ok) { - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer() && m_spellInfo->IsChanneled() && m_spellInfo->IsCooldownStartedOnEvent()) + m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); + } + else + { + if (m_caster->IsPlayer()) { // Xinef: Restore spell mods in case of fail cast m_caster->ToPlayer()->RestoreSpellMods(this); @@ -4530,7 +4534,7 @@ void Spell::finish(bool ok) } // potions disabled by client, send event "not in combat" if need - if (m_caster->GetTypeId() == TYPEID_PLAYER && !m_triggeredByAuraSpell) + if (m_caster->IsPlayer() && !m_triggeredByAuraSpell) m_caster->ToPlayer()->UpdatePotionCooldown(this); // Take mods after trigger spell (needed for 14177 to affect 48664) @@ -4715,7 +4719,7 @@ void Spell::SendSpellStart() if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA)) castFlags |= CAST_FLAG_PROJECTILE; - if (m_caster->GetTypeId() == TYPEID_PLAYER || m_caster->IsPet()) + if (m_caster->IsPlayer() || m_caster->IsPet()) { switch (m_spellInfo->PowerType) { @@ -4776,7 +4780,7 @@ void Spell::SendSpellStart() m_caster->SendMessageToSet(&data, true); - if (!m_spellInfo->IsChanneled() && m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->NeedSendSpectatorData()) + if (!m_spellInfo->IsChanneled() && m_caster->IsPlayer() && m_caster->ToPlayer()->NeedSendSpectatorData()) ArenaSpectator::SendCommand_Spell(m_caster->FindMap(), m_caster->GetGUID(), "SPE", m_spellInfo->Id, m_timer); } @@ -4798,7 +4802,7 @@ void Spell::SendSpellGo() castFlags |= CAST_FLAG_PROJECTILE; // arrows/bullets visual // should only be sent to self, but the current messaging doesn't make that possible - if (m_caster->GetTypeId() == TYPEID_PLAYER || m_caster->IsPet()) + if (m_caster->IsPlayer() || m_caster->IsPet()) { switch (m_spellInfo->PowerType) { @@ -4816,7 +4820,7 @@ void Spell::SendSpellGo() } } - if ((m_caster->GetTypeId() == TYPEID_PLAYER) + if ((m_caster->IsPlayer()) && (m_caster->IsClass(CLASS_DEATH_KNIGHT, CLASS_CONTEXT_ABILITY)) && m_spellInfo->RuneCostID && m_spellInfo->PowerType == POWER_RUNE) @@ -4916,7 +4920,7 @@ void Spell::WriteAmmoToPacket(WorldPacket* data) uint32 ammoInventoryType = 0; uint32 ammoDisplayID = 0; - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { Item* pItem = m_caster->ToPlayer()->GetWeaponForAttack(RANGED_ATTACK); if (pItem) @@ -5203,7 +5207,7 @@ void Spell::SendChannelStart(uint32 duration) m_caster->SendMessageToSet(&data, true); - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->NeedSendSpectatorData()) + if (m_caster->IsPlayer() && m_caster->ToPlayer()->NeedSendSpectatorData()) ArenaSpectator::SendCommand_Spell(m_caster->FindMap(), m_caster->GetGUID(), "SPE", m_spellInfo->Id, -((int32)duration)); m_timer = duration; @@ -5217,7 +5221,7 @@ void Spell::SendResurrectRequest(Player* target) { // get resurrector name for creature resurrections, otherwise packet will be not accepted // for player resurrections the name is looked up by guid - std::string const sentName(m_caster->GetTypeId() == TYPEID_PLAYER + std::string const sentName(m_caster->IsPlayer() ? "" : m_caster->GetNameForLocaleIdx(target->GetSession()->GetSessionDbLocaleIndex())); @@ -5228,7 +5232,7 @@ void Spell::SendResurrectRequest(Player* target) data << sentName; data << uint8(0); // null terminator - data << uint8(m_caster->GetTypeId() == TYPEID_PLAYER ? 0 : 1); // "you'll be afflicted with resurrection sickness" + data << uint8(m_caster->IsPlayer() ? 0 : 1); // "you'll be afflicted with resurrection sickness" // override delay sent with SMSG_CORPSE_RECLAIM_DELAY, set instant resurrection for spells with this attribute if (m_spellInfo->HasAttribute(SPELL_ATTR3_NO_RES_TIMER)) data << uint32(0); @@ -5304,13 +5308,13 @@ void Spell::TakePower() return; //Don't take power if the spell is cast while .cheat power is enabled. - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (m_caster->ToPlayer()->GetCommandStatus(CHEAT_POWER)) return; Powers PowerType = Powers(m_spellInfo->PowerType); bool hit = true; - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { if (PowerType == POWER_RAGE || PowerType == POWER_ENERGY || PowerType == POWER_RUNE || PowerType == POWER_RUNIC_POWER) if (ObjectGuid targetGUID = m_targets.GetUnitTargetGUID()) @@ -5364,7 +5368,7 @@ void Spell::TakePower() void Spell::TakeAmmo() { - if (m_attackType == RANGED_ATTACK && m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_attackType == RANGED_ATTACK && m_caster->IsPlayer()) { Item* pItem = m_caster->ToPlayer()->GetWeaponForAttack(RANGED_ATTACK); @@ -5643,7 +5647,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_CASTER_DEAD; // Spectator check - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (((Player const*)m_caster)->IsSpectator() && m_spellInfo->Id != SPECTATOR_SPELL_BINDSIGHT) return SPELL_FAILED_NOT_HERE; @@ -5657,7 +5661,7 @@ SpellCastResult Spell::CheckCast(bool strict) // check cooldowns to prevent cheating if (!m_spellInfo->HasAttribute(SPELL_ATTR0_PASSIVE)) { - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { //can cast triggered (by aura only?) spells while have this flag if (!HasTriggeredCastFlag(TRIGGERED_IGNORE_CASTER_AURASTATE) && m_caster->ToPlayer()->HasPlayerFlag(PLAYER_ALLOW_ONLY_ABILITY) && !IsNextMeleeSwingSpell()) @@ -5690,12 +5694,12 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_NOT_READY; // only triggered spells can be processed an ended battleground - if (!IsTriggered() && m_caster->GetTypeId() == TYPEID_PLAYER) + if (!IsTriggered() && m_caster->IsPlayer()) if (Battleground* bg = m_caster->ToPlayer()->GetBattleground()) if (bg->GetStatus() == STATUS_WAIT_LEAVE) return SPELL_FAILED_DONT_REPORT; - if (m_caster->GetTypeId() == TYPEID_PLAYER /*&& VMAP::VMapFactory::createOrGetVMapMgr()->isLineOfSightCalcEnabled()*/) // pussywizard: optimization (commented) + if (m_caster->IsPlayer() /*&& VMAP::VMapFactory::createOrGetVMapMgr()->isLineOfSightCalcEnabled()*/) // pussywizard: optimization (commented) { if (m_spellInfo->HasAttribute(SPELL_ATTR0_ONLY_OUTDOORS) && !m_caster->IsOutdoors()) @@ -5774,7 +5778,7 @@ SpellCastResult Spell::CheckCast(bool strict) // Xinef: exploit protection if (reqCombat && !m_spellInfo->CanBeUsedInCombat() && (m_spellInfo->HasEffect(SPELL_EFFECT_RESURRECT) || m_spellInfo->HasEffect(SPELL_EFFECT_RESURRECT_NEW))) { - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->GetMap()->IsDungeon()) + if (m_caster->IsPlayer() && m_caster->GetMap()->IsDungeon()) if (InstanceScript* instanceScript = m_caster->GetInstanceScript()) if (instanceScript->IsEncounterInProgress()) { @@ -5795,7 +5799,7 @@ SpellCastResult Spell::CheckCast(bool strict) // cancel autorepeat spells if cast start when moving // (not wand currently autorepeat cast delayed to moving stop anyway in spell update code) - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->isMoving() && !IsTriggered()) + if (m_caster->IsPlayer() && m_caster->ToPlayer()->isMoving() && !IsTriggered()) { // skip stuck spell to allow use it in falling case and apply spell limitations at movement if ((!m_caster->HasUnitMovementFlag(MOVEMENTFLAG_FALLING_FAR) || m_spellInfo->Effects[0].Effect != SPELL_EFFECT_STUCK) && @@ -5828,7 +5832,7 @@ SpellCastResult Spell::CheckCast(bool strict) // All creatures should be able to cast as passengers freely, restriction and attribute are only for players VehicleSeatEntry const* vehicleSeat = vehicle->GetSeatForPassenger(m_caster); if (!m_spellInfo->HasAttribute(SPELL_ATTR6_ALLOW_WHILE_RIDING_VEHICLE) && !m_spellInfo->HasAttribute(SPELL_ATTR0_ALLOW_WHILE_MOUNTED) - && (vehicleSeat->m_flags & checkMask) != checkMask && m_caster->GetTypeId() == TYPEID_PLAYER) + && (vehicleSeat->m_flags & checkMask) != checkMask && m_caster->IsPlayer()) return SPELL_FAILED_DONT_REPORT; } @@ -5968,7 +5972,7 @@ SpellCastResult Spell::CheckCast(bool strict) } } // Spell casted only on battleground - if (m_spellInfo->HasAttribute(SPELL_ATTR3_ONLY_BATTLEGROUNDS) && m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_spellInfo->HasAttribute(SPELL_ATTR3_ONLY_BATTLEGROUNDS) && m_caster->IsPlayer()) if (!m_caster->ToPlayer()->InBattleground()) return SPELL_FAILED_ONLY_BATTLEGROUNDS; @@ -5988,13 +5992,13 @@ SpellCastResult Spell::CheckCast(bool strict) m_caster->GetZoneAndAreaId(zone, area); SpellCastResult locRes = m_spellInfo->CheckLocation(m_caster->GetMapId(), zone, area, - m_caster->GetTypeId() == TYPEID_PLAYER ? m_caster->ToPlayer() : nullptr); + m_caster->IsPlayer() ? m_caster->ToPlayer() : nullptr); if (locRes != SPELL_CAST_OK) return locRes; } // not let players cast spells at mount (and let do it to creatures) - if (m_caster->IsMounted() && m_caster->GetTypeId() == TYPEID_PLAYER && !HasTriggeredCastFlag(TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE) && + if (m_caster->IsMounted() && m_caster->IsPlayer() && !HasTriggeredCastFlag(TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE) && !m_spellInfo->IsPassive() && !m_spellInfo->HasAttribute(SPELL_ATTR0_ALLOW_WHILE_MOUNTED)) { if (m_caster->IsInFlight()) @@ -6189,7 +6193,7 @@ SpellCastResult Spell::CheckCast(bool strict) case SPELL_EFFECT_POWER_DRAIN: { // Can be area effect, Check only for players and not check if target - caster (spell can have multiply drain/burn effects) - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (Unit* target = m_targets.GetUnitTarget()) if (target != m_caster && !target->HasActivePowerType(Powers(m_spellInfo->Effects[i].MiscValue))) return SPELL_FAILED_BAD_TARGETS; @@ -6216,7 +6220,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_ROOTED; } } - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (Unit* target = m_targets.GetUnitTarget()) if (!target->IsAlive()) return SPELL_FAILED_BAD_TARGETS; @@ -6426,7 +6430,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_ALREADY_HAVE_CHARM; } - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->IsClass(CLASS_WARLOCK, CLASS_CONTEXT_PET) && strict) + if (m_caster->IsPlayer() && m_caster->IsClass(CLASS_WARLOCK, CLASS_CONTEXT_PET) && strict) if (Pet* pet = m_caster->ToPlayer()->GetPet()) pet->CastSpell(pet, 32752, true, nullptr, nullptr, pet->GetGUID()); //starting cast, trigger pet stun (cast by pet so it doesn't attack player) @@ -6526,7 +6530,7 @@ SpellCastResult Spell::CheckCast(bool strict) case SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER: { //Do not allow to cast it before BG starts. - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (Battleground const* bg = m_caster->ToPlayer()->GetBattleground()) if (bg->GetStatus() != STATUS_IN_PROGRESS) return SPELL_FAILED_TRY_AGAIN; @@ -6560,7 +6564,7 @@ SpellCastResult Spell::CheckCast(bool strict) { if (m_caster->HasUnitState(UNIT_STATE_ROOT)) { - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) return SPELL_FAILED_ROOTED; else return SPELL_FAILED_DONT_REPORT; @@ -6579,7 +6583,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (!sScriptMgr->CanSelectSpecTalent(this)) return SPELL_FAILED_DONT_REPORT; // can't change during already started arena/battleground - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (Battleground const* bg = m_caster->ToPlayer()->GetBattleground()) if (bg->GetStatus() == STATUS_IN_PROGRESS) return SPELL_FAILED_NOT_IN_BATTLEGROUND; @@ -6665,7 +6669,7 @@ SpellCastResult Spell::CheckCast(bool strict) InstanceTemplate const* it = sObjectMgr->GetInstanceTemplate(m_caster->GetMapId()); if (it) allowMount = it->AllowMount; - if (m_caster->GetTypeId() == TYPEID_PLAYER && !allowMount && !m_spellInfo->AreaGroupId) + if (m_caster->IsPlayer() && !allowMount && !m_spellInfo->AreaGroupId) return SPELL_FAILED_NO_MOUNTS_ALLOWED; if (m_caster->IsInDisallowedMountForm()) @@ -6700,7 +6704,7 @@ SpellCastResult Spell::CheckCast(bool strict) // not allow cast fly spells if not have req. skills (all spells is self target) // allow always ghost flight spells - if (m_originalCaster && m_originalCaster->GetTypeId() == TYPEID_PLAYER && m_originalCaster->IsAlive()) + if (m_originalCaster && m_originalCaster->IsPlayer() && m_originalCaster->IsAlive()) { Battlefield* Bf = sBattlefieldMgr->GetBattlefieldToZoneId(m_originalCaster->GetZoneId()); if (AreaTableEntry const* pArea = sAreaTableStore.LookupEntry(m_originalCaster->GetAreaId())) @@ -7088,7 +7092,7 @@ SpellCastResult Spell::CheckRange(bool strict) return SPELL_FAILED_TOO_CLOSE; } - if (m_caster->GetTypeId() == TYPEID_PLAYER && (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc(static_cast(M_PI), target)) + if (m_caster->IsPlayer() && (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc(static_cast(M_PI), target)) return SPELL_FAILED_UNIT_NOT_INFRONT; } @@ -7123,7 +7127,7 @@ SpellCastResult Spell::CheckPower() return SPELL_CAST_OK; //While .cheat power is enabled dont check if we need power to cast the spell - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { if (m_caster->ToPlayer()->GetCommandStatus(CHEAT_POWER)) { @@ -7264,7 +7268,7 @@ SpellCastResult Spell::CheckItems() { // Xinef: this is not true in my opinion, in eg bladestorm will not be canceled after disarm //if (!HasTriggeredCastFlag(TRIGGERED_IGNORE_EQUIPPED_ITEM_REQUIREMENT)) - if (m_caster->GetTypeId() == TYPEID_PLAYER && !m_caster->ToPlayer()->HasItemFitToSpellRequirements(m_spellInfo)) + if (m_caster->IsPlayer() && !m_caster->ToPlayer()->HasItemFitToSpellRequirements(m_spellInfo)) return SPELL_FAILED_EQUIPPED_ITEM_CLASS; } @@ -7358,7 +7362,7 @@ SpellCastResult Spell::CheckItems() { // m_targets.GetUnitTarget() means explicit cast, otherwise we dont check for possible equip error Unit* target = m_targets.GetUnitTarget() ? m_targets.GetUnitTarget() : player; - if (target->GetTypeId() == TYPEID_PLAYER && !IsTriggered()) + if (target->IsPlayer() && !IsTriggered()) { // SPELL_EFFECT_CREATE_ITEM_2 differs from SPELL_EFFECT_CREATE_ITEM in that it picks the random item to create from a pool of potential items, // so we need to make sure there is at least one free space in the player's inventory @@ -7855,7 +7859,7 @@ bool Spell::UpdatePointers() m_originalCaster = nullptr; } - if (m_castItemGUID && m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_castItemGUID && m_caster->IsPlayer()) { m_CastItem = m_caster->ToPlayer()->GetItemByGuid(m_castItemGUID); // cast item not found, somehow the item is no longer where we expected @@ -8118,7 +8122,7 @@ SpellEvent::~SpellEvent() else { LOG_ERROR("spells", "~SpellEvent: {} {} tried to delete non-deletable spell {}. Was not deleted, causes memory leak.", - (m_Spell->GetCaster()->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), m_Spell->GetCaster()->GetGUID().ToString(), m_Spell->m_spellInfo->Id); + (m_Spell->GetCaster()->IsPlayer() ? "Player" : "Creature"), m_Spell->GetCaster()->GetGUID().ToString(), m_Spell->m_spellInfo->Id); ABORT(); } } @@ -8308,7 +8312,7 @@ void Spell::DoAllEffectOnLaunchTarget(TargetInfo& targetInfo, float* multiplier) if (m_spellInfo->Effects[i].IsAreaAuraEffect() || m_spellInfo->Effects[i].IsTargetingArea() || (m_spellInfo->Effects[i].ChainTarget > 1 && m_spellInfo->DmgClass != SPELL_DAMAGE_CLASS_MAGIC)) { m_damage = unit->CalculateAOEDamageReduction(m_damage, m_spellInfo->SchoolMask, m_caster); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { uint32 targetAmount = m_UniqueTargetInfo.size(); if (targetAmount > 10) @@ -8817,7 +8821,7 @@ bool Spell::HasGlobalCooldown() const // Only player or controlled units have global cooldown if (m_caster->GetCharmInfo()) return m_caster->GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(m_spellInfo); - else if (m_caster->GetTypeId() == TYPEID_PLAYER) + else if (m_caster->IsPlayer()) return m_caster->ToPlayer()->GetGlobalCooldownMgr().HasGlobalCooldown(m_spellInfo); else return false; @@ -8835,7 +8839,7 @@ void Spell::TriggerGlobalCooldown() return; } - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (m_caster->ToPlayer()->GetCommandStatus(CHEAT_COOLDOWN)) return; @@ -8845,7 +8849,7 @@ void Spell::TriggerGlobalCooldown() if (m_spellInfo->StartRecoveryTime >= MIN_GCD && m_spellInfo->StartRecoveryTime <= MAX_GCD) { // gcd modifier auras are applied only to own spells and only players have such mods - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) m_caster->ToPlayer()->ApplySpellMod(m_spellInfo->Id, SPELLMOD_GLOBAL_COOLDOWN, gcd, this); // Apply haste rating @@ -8864,7 +8868,7 @@ void Spell::TriggerGlobalCooldown() // Only players or controlled units have global cooldown if (m_caster->GetCharmInfo()) m_caster->GetCharmInfo()->GetGlobalCooldownMgr().AddGlobalCooldown(m_spellInfo, gcd); - else if (m_caster->GetTypeId() == TYPEID_PLAYER) + else if (m_caster->IsPlayer()) m_caster->ToPlayer()->GetGlobalCooldownMgr().AddGlobalCooldown(m_spellInfo, gcd); } @@ -8880,7 +8884,7 @@ void Spell::CancelGlobalCooldown() // Only players or controlled units have global cooldown if (m_caster->GetCharmInfo()) m_caster->GetCharmInfo()->GetGlobalCooldownMgr().CancelGlobalCooldown(m_spellInfo); - else if (m_caster->GetTypeId() == TYPEID_PLAYER) + else if (m_caster->IsPlayer()) m_caster->ToPlayer()->GetGlobalCooldownMgr().CancelGlobalCooldown(m_spellInfo); } @@ -9035,7 +9039,7 @@ namespace Acore if (!target->ToGameObject()->IsInRange(_position->GetPositionX(), _position->GetPositionY(), _position->GetPositionZ(), _range)) return false; } - else if (!target->IsInDist(_position, _range)) + else if (!target->IsWithinDist3d(_position, _range)) return false; else if (target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->IsAvoidingAOE()) // pussywizard return false; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 9e1d22a08..2a3d7b008 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -283,7 +283,7 @@ void Spell::EffectInstaKill(SpellEffIndex /*effIndex*/) if (!unitTarget || !unitTarget->IsAlive() || unitTarget->HasAura(27827)) // Spirit of redemption doesn't make you death, but can cause infinite loops return; - if (unitTarget->GetTypeId() == TYPEID_PLAYER) + if (unitTarget->IsPlayer()) if (unitTarget->ToPlayer()->GetCommandStatus(CHEAT_GOD)) return; @@ -473,7 +473,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) case SPELLFAMILY_DRUID: { // Ferocious Bite - if (m_caster->GetTypeId() == TYPEID_PLAYER && (m_spellInfo->SpellFamilyFlags[0] & 0x000800000) && m_spellInfo->SpellVisual[0] == 6587) + if (m_caster->IsPlayer() && (m_spellInfo->SpellFamilyFlags[0] & 0x000800000) && m_spellInfo->SpellVisual[0] == 6587) { // converts each extra point of energy into ($f1+$AP/410) additional damage float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK); @@ -545,7 +545,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) // Eviscerate else if (m_spellInfo->SpellFamilyFlags[0] & 0x00020000) { - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { if (uint32 combo = m_caster->ToPlayer()->GetComboPoints()) { @@ -712,7 +712,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) // HoL, Arc Weld case 59086: { - if( m_caster && m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->isMoving() ) + if( m_caster && m_caster->IsPlayer() && m_caster->ToPlayer()->isMoving() ) m_caster->CastSpell(m_caster, 59097, true); return; @@ -934,7 +934,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) } // Remove spell cooldown (not category) if spell triggering spell with cooldown and same category - if (m_caster->GetTypeId() == TYPEID_PLAYER && spellInfo->CategoryRecoveryTime && m_spellInfo->GetCategory() == spellInfo->GetCategory()) + if (m_caster->IsPlayer() && spellInfo->CategoryRecoveryTime && m_spellInfo->GetCategory() == spellInfo->GetCategory()) { m_caster->ToPlayer()->RemoveSpellCooldown(spellInfo->Id); } @@ -988,7 +988,7 @@ void Spell::EffectTriggerMissileSpell(SpellEffIndex effIndex) } // Remove spell cooldown (not category) if spell triggering spell with cooldown and same category - if (m_caster->GetTypeId() == TYPEID_PLAYER && spellInfo->CategoryRecoveryTime && m_spellInfo->GetCategory() == spellInfo->GetCategory()) + if (m_caster->IsPlayer() && spellInfo->CategoryRecoveryTime && m_spellInfo->GetCategory() == spellInfo->GetCategory()) { m_caster->ToPlayer()->RemoveSpellCooldown(spellInfo->Id); } @@ -1085,7 +1085,7 @@ void Spell::EffectJump(SpellEffIndex effIndex) CalculateJumpSpeeds(effIndex, m_caster->GetExactDist2d(unitTarget), speedXY, speedZ); m_caster->GetMotionMaster()->MoveJump(*unitTarget, speedXY, speedZ); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { sScriptMgr->AnticheatSetUnderACKmount(m_caster->ToPlayer()); } @@ -1124,7 +1124,7 @@ void Spell::EffectJumpDest(SpellEffIndex effIndex) player->SetCanTeleport(true); } - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { sScriptMgr->AnticheatSetUnderACKmount(m_caster->ToPlayer()); } @@ -1148,7 +1148,7 @@ void Spell::EffectJumpDest(SpellEffIndex effIndex) } m_caster->GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { sScriptMgr->AnticheatSetUnderACKmount(m_caster->ToPlayer()); } @@ -1173,7 +1173,7 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/) if (!unitTarget || unitTarget->IsInFlight()) return; - if (unitTarget->GetTypeId() == TYPEID_PLAYER) + if (unitTarget->IsPlayer()) { sScriptMgr->AnticheatSetUnderACKmount(unitTarget->ToPlayer()); } @@ -1215,13 +1215,13 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/) unitTarget->GetVehicleKit()->TeleportVehicle(x, y, z, orientation); else { - bool withPet = unitTarget->GetTypeId() == TYPEID_PLAYER && m_spellInfo->SpellFamilyName == SPELLFAMILY_GENERIC && unitTarget->GetMap()->IsDungeon() && unitTarget->GetExactDist(x, y, z) > 50.0f; + bool withPet = unitTarget->IsPlayer() && m_spellInfo->SpellFamilyName == SPELLFAMILY_GENERIC && unitTarget->GetMap()->IsDungeon() && unitTarget->GetExactDist(x, y, z) > 50.0f; unitTarget->NearTeleportTo(x, y, z, orientation, unitTarget == m_caster, false, withPet, true); - if (unitTarget->GetTypeId() == TYPEID_PLAYER) // pussywizard: for units it's done inside NearTeleportTo + if (unitTarget->IsPlayer()) // pussywizard: for units it's done inside NearTeleportTo unitTarget->UpdateObjectVisibility(true); } } - else if (unitTarget->GetTypeId() == TYPEID_PLAYER) + else if (unitTarget->IsPlayer()) unitTarget->ToPlayer()->TeleportTo(mapid, x, y, z, orientation, unitTarget == m_caster ? TELE_TO_SPELL : 0); else { @@ -1878,7 +1878,7 @@ void Spell::EffectEnergize(SpellEffIndex effIndex) Powers power = Powers(m_spellInfo->Effects[effIndex].MiscValue); - if (unitTarget->GetTypeId() == TYPEID_PLAYER && !unitTarget->HasActivePowerType(power) && m_spellInfo->SpellFamilyName != SPELLFAMILY_POTION + if (unitTarget->IsPlayer() && !unitTarget->HasActivePowerType(power) && m_spellInfo->SpellFamilyName != SPELLFAMILY_POTION && !m_spellInfo->HasAttribute(SPELL_ATTR7_ONLY_IN_SPELLBOOK_UNTIL_LEARNED)) return; @@ -1983,7 +1983,7 @@ void Spell::EffectEnergizePct(SpellEffIndex effIndex) Powers power = Powers(m_spellInfo->Effects[effIndex].MiscValue); - if (unitTarget->GetTypeId() == TYPEID_PLAYER && !unitTarget->HasActivePowerType(power) && !m_spellInfo->HasAttribute(SPELL_ATTR7_ONLY_IN_SPELLBOOK_UNTIL_LEARNED)) + if (unitTarget->IsPlayer() && !unitTarget->HasActivePowerType(power) && !m_spellInfo->HasAttribute(SPELL_ATTR7_ONLY_IN_SPELLBOOK_UNTIL_LEARNED)) return; uint32 maxPower = unitTarget->GetMaxPower(power); @@ -2725,7 +2725,7 @@ void Spell::EffectUntrainTalents(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || m_caster->GetTypeId() == TYPEID_PLAYER) + if (!unitTarget || m_caster->IsPlayer()) return; if (ObjectGuid guid = m_caster->GetGUID()) // the trainer is the caster @@ -3108,7 +3108,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) pet->InitTalentForLevel(); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { pet->SavePetToDB(PET_SAVE_AS_CURRENT); m_caster->ToPlayer()->PetSpellInitialize(); @@ -3187,7 +3187,7 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex) return; } - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->ToPlayer()->RemovePet(OldSummon, PET_SAVE_NOT_IN_SLOT, false); else return; @@ -3367,7 +3367,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) AddComboPointGain(unitTarget, 1); } // 50% more damage with daggers - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) if (Item* item = m_caster->ToPlayer()->GetWeaponForAttack(m_attackType, true)) if (item->GetTemplate()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER) AddPct(totalDamagePercentMod, 50.0f); @@ -4018,7 +4018,7 @@ void Spell::EffectSanctuary(SpellEffIndex /*effIndex*/) if (m_spellInfo->Id != 59646) unitTarget->getHostileRefMgr().addThreatPercent(-100); - if (unitTarget->GetTypeId() == TYPEID_PLAYER) + if (unitTarget->IsPlayer()) unitTarget->ToPlayer()->SendAttackSwingCancelAttack(); // melee and ranged forced attack cancel } else @@ -4669,7 +4669,7 @@ void Spell::EffectParry(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT) return; - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) m_caster->ToPlayer()->SetCanParry(true); } @@ -4678,7 +4678,7 @@ void Spell::EffectBlock(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT) return; - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) m_caster->ToPlayer()->SetCanBlock(true); } @@ -4949,7 +4949,7 @@ void Spell::EffectChargeDest(SpellEffIndex /*effIndex*/) m_caster->GetMotionMaster()->MoveCharge(pos.m_positionX, pos.m_positionY, pos.m_positionZ); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { sScriptMgr->AnticheatSetUnderACKmount(m_caster->ToPlayer()); } @@ -5007,7 +5007,7 @@ void Spell::EffectKnockBack(SpellEffIndex effIndex) unitTarget->KnockbackFrom(x, y, speedxy, speedz); - if (unitTarget->GetTypeId() == TYPEID_PLAYER) + if (unitTarget->IsPlayer()) { sScriptMgr->AnticheatSetUnderACKmount(unitTarget->ToPlayer()); } @@ -5026,13 +5026,13 @@ void Spell::EffectLeapBack(SpellEffIndex effIndex) //1891: Disengage m_caster->JumpTo(speedxy, speedz, m_spellInfo->SpellFamilyName != SPELLFAMILY_HUNTER); - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { sScriptMgr->AnticheatSetUnderACKmount(m_caster->ToPlayer()); } // xinef: changes fall time - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) m_caster->ToPlayer()->SetFallInformation(GameTime::GetGameTime().count(), m_caster->GetPositionZ()); } @@ -5125,7 +5125,7 @@ void Spell::EffectPullTowards(SpellEffIndex effIndex) unitTarget->GetMotionMaster()->MoveJump(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), speedXY, speedZ); - if (unitTarget->GetTypeId() == TYPEID_PLAYER) + if (unitTarget->IsPlayer()) { sScriptMgr->AnticheatSetUnderACKmount(unitTarget->ToPlayer()); } @@ -5421,7 +5421,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) } case GAMEOBJECT_TYPE_SUMMONING_RITUAL: { - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { pGameObj->AddUniqueUse(m_caster->ToPlayer()); m_caster->AddGameObject(pGameObj); // will be removed at spell cancel @@ -5836,7 +5836,7 @@ void Spell::EffectCreateTamedPet(SpellEffIndex effIndex) pet->InitTalentForLevel(); - if (unitTarget->GetTypeId() == TYPEID_PLAYER) + if (unitTarget->IsPlayer()) { pet->SavePetToDB(PET_SAVE_AS_CURRENT); unitTarget->ToPlayer()->PetSpellInitialize(); @@ -5867,7 +5867,7 @@ void Spell::EffectTitanGrip(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT) return; - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_caster->IsPlayer()) { if (Aura* aur = m_caster->GetAura(49152)) aur->RecalculateAmountOfEffects(); @@ -5942,7 +5942,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const* uint8 summonLevel = caster->GetLevel(); // level of pet summoned using engineering item based at engineering skill level - if (m_CastItem && caster->GetTypeId() == TYPEID_PLAYER) + if (m_CastItem && caster->IsPlayer()) if (ItemTemplate const* proto = m_CastItem->GetTemplate()) { // xinef: few special cases diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 5c30b040d..9069edb00 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -880,6 +880,15 @@ bool SpellInfo::HasEffect(SpellEffects effect) const return false; } +bool SpellInfo::HasEffectMechanic(Mechanics mechanic) const +{ + for (auto const& effect : Effects) + if (effect.Mechanic == mechanic) + return true; + + return false; +} + bool SpellInfo::HasAura(AuraType aura) const { for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) @@ -1775,7 +1784,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta if (caster != unitTarget) { - if (caster->GetTypeId() == TYPEID_PLAYER) + if (caster->IsPlayer()) { // Do not allow these spells to target creatures not tapped by us (Banish, Polymorph, many quest spells) if (AttributesEx2 & SPELL_ATTR2_CANNOT_CAST_ON_TAPPED) @@ -1871,14 +1880,14 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta if (!CheckTargetCreatureType(unitTarget)) { - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) return SPELL_FAILED_TARGET_IS_PLAYER; else return SPELL_FAILED_BAD_TARGETS; } // check GM mode and GM invisibility - only for player casts (npc casts are controlled by AI) and negative spells - if (unitTarget != caster && (caster->IsControlledByPlayer() || !IsPositive()) && unitTarget->GetTypeId() == TYPEID_PLAYER) + if (unitTarget != caster && (caster->IsControlledByPlayer() || !IsPositive()) && unitTarget->IsPlayer()) { if (!unitTarget->ToPlayer()->IsVisible()) return SPELL_FAILED_BM_OR_INVISGOD; @@ -1965,7 +1974,7 @@ bool SpellInfo::CheckTargetCreatureType(Unit const* target) const if (SpellFamilyName == SPELLFAMILY_WARLOCK && GetCategory() == 1179) { // not allow cast at player - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) return false; else return true; diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 3d6493029..534ad254a 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -407,6 +407,7 @@ public: uint32 GetCategory() const; bool HasEffect(SpellEffects effect) const; + bool HasEffectMechanic(Mechanics mechanic) const; bool HasAura(AuraType aura) const; bool HasAnyAura() const; bool HasAreaAuraEffect() const; diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index c2dea2e66..46f31c6f4 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4806,6 +4806,12 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_0].MiscValue = 124; }); + // Power of the Guardian + ApplySpellFix({ 28142, 28143, 28144, 28145 }, [](SpellInfo* spellInfo) + { + spellInfo->AttributesEx3 |= SPELL_ATTR3_ALLOW_AURA_WHILE_DEAD; + }); + for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i]; diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 286282bd3..3053564e6 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -1134,7 +1134,7 @@ public: return true; // check index - if (unit->GetTypeId() == TYPEID_PLAYER) + if (unit->IsPlayer()) { if (index >= PLAYER_END) return true; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 12a6f3b6a..6eeeaa127 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1130,7 +1130,7 @@ public: return false; } - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { if (handler->HasLowerSecurity(target->ToPlayer())) { @@ -2659,7 +2659,7 @@ public: return false; } - handler->PSendSysMessage(LANG_MOVEGENS_LIST, (unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), unit->GetGUID().ToString()); + handler->PSendSysMessage(LANG_MOVEGENS_LIST, (unit->IsPlayer() ? "Player" : "Creature"), unit->GetGUID().ToString()); MotionMaster* motionMaster = unit->GetMotionMaster(); float x, y, z; @@ -2694,7 +2694,7 @@ public: case CHASE_MOTION_TYPE: { Unit* target = nullptr; - if (unit->GetTypeId() == TYPEID_PLAYER) + if (unit->IsPlayer()) { target = static_cast const*>(movementGenerator)->GetTarget(); } @@ -2707,7 +2707,7 @@ public: { handler->SendSysMessage(LANG_MOVEGENS_CHASE_NULL); } - else if (target->GetTypeId() == TYPEID_PLAYER) + else if (target->IsPlayer()) { handler->PSendSysMessage(LANG_MOVEGENS_CHASE_PLAYER, target->GetName(), target->GetGUID().ToString()); } @@ -2720,7 +2720,7 @@ public: case FOLLOW_MOTION_TYPE: { Unit* target = nullptr; - if (unit->GetTypeId() == TYPEID_PLAYER) + if (unit->IsPlayer()) { target = static_cast const*>(movementGenerator)->GetTarget(); } @@ -2733,7 +2733,7 @@ public: { handler->SendSysMessage(LANG_MOVEGENS_FOLLOW_NULL); } - else if (target->GetTypeId() == TYPEID_PLAYER) + else if (target->IsPlayer()) { handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_PLAYER, target->GetName(), target->GetGUID().ToString()); } @@ -2809,7 +2809,7 @@ public: return false; } - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { if (handler->HasLowerSecurity(target->ToPlayer())) { diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 91a8706ff..df975ac6e 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -355,7 +355,7 @@ public: return false; } - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { // check online security if (handler->HasLowerSecurity(target->ToPlayer())) @@ -370,7 +370,7 @@ public: else if (target->IsPet()) { Unit* owner = target->GetOwner(); - if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet*)target)->IsPermanentPetFor(owner->ToPlayer())) + if (owner && owner->IsPlayer() && ((Pet*)target)->IsPermanentPetFor(owner->ToPlayer())) { // check online security if (handler->HasLowerSecurity(owner->ToPlayer())) @@ -666,7 +666,7 @@ public: } // check online security - if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity(target->ToPlayer())) + if (target->IsPlayer() && handler->HasLowerSecurity(target->ToPlayer())) { return false; } @@ -843,7 +843,7 @@ public: { target = handler->GetSession()->GetPlayer(); } - else if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity(target->ToPlayer())) // check online security + else if (target->IsPlayer() && handler->HasLowerSecurity(target->ToPlayer())) // check online security { return false; } @@ -860,7 +860,7 @@ public: { target = handler->GetSession()->GetPlayer(); } - else if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity(target->ToPlayer())) // check online security + else if (target->IsPlayer() && handler->HasLowerSecurity(target->ToPlayer())) // check online security { return false; } @@ -873,7 +873,7 @@ public: { Player* target = handler->getSelectedPlayerOrSelf(); - if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity(target->ToPlayer())) // check online security + if (target->IsPlayer() && handler->HasLowerSecurity(target->ToPlayer())) // check online security return false; if (!target->GetAuraEffectsByType(SPELL_AURA_MOUNTED).empty()) @@ -892,7 +892,7 @@ public: { target = handler->GetSession()->GetPlayer(); } - else if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity(target->ToPlayer())) // check online security + else if (target->IsPlayer() && handler->HasLowerSecurity(target->ToPlayer())) // check online security { return false; } diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index afd83c1a6..22b74bfa3 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -54,7 +54,7 @@ public: Player* player = handler->GetSession()->GetPlayer(); Creature* creatureTarget = handler->getSelectedCreature(); - if (!creatureTarget || creatureTarget->IsPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER) + if (!creatureTarget || creatureTarget->IsPet() || creatureTarget->IsPlayer()) { handler->SendErrorMessage(LANG_SELECT_CREATURE); return false; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index de39ca404..ed9445b77 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -245,4 +245,3 @@ void AddSC_boss_gyth() new boss_gyth(); RegisterSpellScript(spell_gyth_chromatic_protection); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp index 558e0ba47..a103a521c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -275,4 +275,3 @@ void AddSC_boss_broodlord() new go_suppression_device(); RegisterSpellScript(spell_suppression_aura); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index 19fac9d23..9b69b0e7a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -365,4 +365,3 @@ void AddSC_boss_chromaggus() RegisterSpellScript(spell_gen_elemental_shield); RegisterSpellScript(spell_gen_brood_power); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 8bbea5480..a356db01a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -673,7 +673,7 @@ struct boss_nefarian : public BossAI { for (auto& ref : me->GetThreatMgr().GetThreatList()) { - if (ref->getTarget() && ref->getTarget()->GetTypeId() == TYPEID_PLAYER) + if (ref->getTarget() && ref->getTarget()->IsPlayer()) { classesPresent.insert(ref->getTarget()->getClass()); } @@ -1277,4 +1277,3 @@ void AddSC_boss_nefarian() RegisterSpellScript(spell_shadowblink); RegisterSpellScript(spell_spawn_drakonid); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index d7ab25b08..7265ab78e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -338,4 +338,3 @@ void AddSC_boss_razorgore() new go_orb_of_domination(); RegisterSpellScript(spell_egg_event); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index 45cf9d1f0..c2b0a641e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -328,4 +328,3 @@ void AddSC_boss_vaelastrasz() new boss_vaelastrasz(); RegisterSpellScript(spell_vael_burning_adrenaline); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp index 5a24defea..e2db717c4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -531,4 +531,3 @@ void AddSC_instance_blackwing_lair() RegisterSpellScript(spell_bwl_shadowflame); new at_orb_of_command(); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index a1aaddce1..9f6823b3b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -229,4 +229,3 @@ void AddSC_boss_baron_geddon() RegisterSpellScript(spell_geddon_inferno_aura); RegisterSpellScript(spell_geddon_armageddon_aura); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp index 6514408f0..3682a67fd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -230,4 +230,3 @@ void AddSC_boss_garr() RegisterSpellScript(spell_garr_separation_anxiety_aura); RegisterSpellScript(spell_garr_frenzy); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp index 6efca09c4..978cf2f80 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -167,4 +167,3 @@ void AddSC_boss_magmadar() // Spells RegisterSpellScript(spell_magmadar_lava_bomb); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp index f79b43552..eee82b933 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -661,4 +661,3 @@ void AddSC_boss_majordomo() RegisterSpellScript(spell_majordomo_separation_anxiety_aura); RegisterSpellScript(spell_summon_ragnaros); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index 95049716c..84dfa5378 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -564,4 +564,3 @@ void AddSC_boss_ragnaros() RegisterSpellScript(spell_ragnaros_lava_burst_randomizer); RegisterSpellScript(spell_ragnaros_summon_sons_of_flame); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index 4f37b434c..fc135b281 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -187,4 +187,3 @@ void AddSC_boss_shazzrah() // Spells RegisterSpellScript(spell_shazzrah_gate_dummy); } - diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp index cd7cde58b..9abac7475 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp @@ -268,4 +268,3 @@ void AddSC_molten_core() // Spells RegisterSpellScript(spell_mc_play_dead_aura); } - diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index de096a539..5c2e682aa 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -186,4 +186,3 @@ void AddSC_instance_gnomeregan() new npc_kernobee(); new spell_gnomeregan_radiation_bolt(); } - diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp index c74f4e088..ff5989998 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp @@ -2084,4 +2084,3 @@ void AddSC_boss_chess_event() RegisterSpellScript(spell_control_piece); } - diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 59dfb2990..e4e5bab49 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -69,7 +69,7 @@ struct boss_curator : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_KILL); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index cd9de7f46..93e90ca33 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -72,7 +72,7 @@ struct boss_maiden_of_virtue : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_SLAY); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index d2d361fe0..f95f8e99a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -139,7 +139,7 @@ struct boss_attumen : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_KILL); } @@ -416,4 +416,3 @@ void AddSC_boss_attumen() RegisterKarazhanCreatureAI(boss_attumen); RegisterSpellScript(spell_midnight_fixate); } - diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index dbbc87cdd..e9313e0f7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -178,7 +178,7 @@ struct boss_moroes : public BossAI void KilledUnit(Unit* victim) override { - if (!_recentlySpoken && victim->GetTypeId() == TYPEID_PLAYER) + if (!_recentlySpoken && victim->IsPlayer()) { Talk(SAY_KILL); _recentlySpoken = true; @@ -283,4 +283,3 @@ void AddSC_boss_moroes() RegisterKarazhanCreatureAI(boss_moroes); RegisterSpellScript(spell_moroes_vanish); } - diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 6289d41fc..12d1df540 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -149,7 +149,7 @@ struct boss_netherspite : public BossAI } } // buff the target - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { target->AddAura(PlayerBuff[j], target); } @@ -177,7 +177,7 @@ struct boss_netherspite : public BossAI } } // aggro target if Red Beam - if (j == RED_PORTAL && me->GetVictim() != target && target->GetTypeId() == TYPEID_PLAYER) + if (j == RED_PORTAL && me->GetVictim() != target && target->IsPlayer()) { me->GetThreatMgr().AddThreat(target, 100000.0f + DoGetThreat(me->GetVictim())); } @@ -336,4 +336,3 @@ void AddSC_boss_netherspite() RegisterKarazhanCreatureAI(boss_netherspite); RegisterSpellScript(spell_nether_portal_perseverence); } - diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 10d03fa83..53d7b05a0 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -397,4 +397,3 @@ void AddSC_boss_malchezaar() RegisterKarazhanCreatureAI(npc_netherspite_infernal); RegisterSpellScript(spell_malchezaar_enfeeble); } - diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index d40ba1bdb..8f768c8f8 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -502,4 +502,3 @@ void AddSC_boss_shade_of_aran() RegisterSpellScript(spell_flamewreath_aura); new at_karazhan_atiesh_aran(); } - diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index 4530fcb95..3b5092fab 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -224,7 +224,7 @@ struct boss_terestian_illhoof : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_SLAY); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 114d0201b..95d0ccd44 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -609,4 +609,3 @@ void AddSC_instance_karazhan() RegisterSpellScript(spell_karazhan_overload_aura); RegisterSpellScript(spell_karazhan_blink); } - diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index a66568bf5..d81b298cd 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -142,7 +142,7 @@ struct boss_felblood_kaelthas : public ScriptedAI void MoveInLineOfSight(Unit* who) override { - if (!introSpeak && me->IsWithinDistInMap(who, 40.0f) && who->GetTypeId() == TYPEID_PLAYER) + if (!introSpeak && me->IsWithinDistInMap(who, 40.0f) && who->IsPlayer()) { Talk(SAY_AGGRO); introSpeak = true; @@ -313,4 +313,3 @@ void AddSC_boss_felblood_kaelthas() RegisterMagistersTerraceCreatureAI(boss_felblood_kaelthas); RegisterSpellScript(spell_mt_phoenix_burn); } - diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 2fa74afae..305091957 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -292,7 +292,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI for (ThreatContainer::StorageType::const_iterator itr = tList.begin(); itr != tList.end(); ++itr) { Unit* pUnit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()); - if (pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->GetThreatMgr().GetThreat(pUnit)) + if (pUnit && pUnit->IsPlayer() && me->GetThreatMgr().GetThreat(pUnit)) { float threatMod = GetThreatMod(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth(), pUnit->GetMaxHealth(), pUnit); me->GetThreatMgr().ModifyThreatByPercent(pUnit, -100); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 07ae7403f..225933956 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -116,7 +116,7 @@ struct boss_selin_fireheart : public ScriptedAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index abcf65c0e..6dbf562d7 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -82,7 +82,7 @@ struct boss_vexallus : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index cef361a80..bc0be89fe 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -1257,4 +1257,3 @@ void AddSC_the_scarlet_enclave_c1() RegisterSpellScript(spell_death_knight_initiate_visual); } - diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 8e936fddc..eb9e7777b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -77,7 +77,7 @@ public: void SpellHit(Unit* caster, SpellInfo const* spell) override { - if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->IsAlive() && !speechCounter) + if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->IsPlayer() && me->IsAlive() && !speechCounter) { if (Player* player = caster->ToPlayer()) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter3.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter3.cpp index ff1dede33..e10f3d12c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter3.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter3.cpp @@ -39,4 +39,3 @@ void AddSC_the_scarlet_enclave_c3() { RegisterSpellScript(spell_q12779_an_end_to_all_things); } - diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index e324dd7f8..c018ba6a8 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1249,4 +1249,3 @@ void AddSC_the_scarlet_enclave_c5() new spell_chapter5_light_of_dawn_aura(); new spell_chapter5_rebuke(); } - diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index 76af8ead4..9c83da294 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -213,4 +213,3 @@ void AddSC_boss_kormok() RegisterSpellScript(spell_kormok_summon_bone_mages); RegisterSpellScript(spell_kormok_summon_bone_minions); } - diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 318def2e4..71e3f7e3f 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -464,4 +464,3 @@ void AddSC_instance_scholomance() new spell_scholomance_boon_of_life(); new npc_scholomance_occultist(); } - diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index 9d9df6d45..e16f0ed2c 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -531,4 +531,3 @@ void AddSC_boss_apothecary_hummel() RegisterSpellScript(spell_apothecary_perfume_spill); RegisterSpellScript(spell_apothecary_cologne_spill); } - diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 3ce654c6d..718857c43 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -237,4 +237,3 @@ void AddSC_instance_shadowfang_keep() new spell_shadowfang_keep_haunting_spirits(); new spell_shadowfang_keep_forsaken_skills(); } - diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 0dc316c08..4ed70e573 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -302,4 +302,3 @@ void AddSC_instance_sunken_temple() new spell_temple_of_atal_hakkar_hex_of_jammal_an(); new spell_temple_of_atal_hakkar_awaken_the_soulflayer(); } - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index f0c132850..1fdb6a115 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -104,7 +104,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50)) + if (victim->IsPlayer() && roll_chance_i(50)) Talk(YELL_KILL); } @@ -526,4 +526,3 @@ void AddSC_boss_brutallus() RegisterSpellScript(spell_brutallus_burn); new AreaTrigger_at_sunwell_madrigosa(); } - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index f58a12ad3..88375cdde 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -143,7 +143,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && urand(0, 1)) + if (victim->IsPlayer() && urand(0, 1)) Talk(YELL_SAC_KILL); } @@ -291,7 +291,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && urand(0, 1)) + if (victim->IsPlayer() && urand(0, 1)) Talk(YELL_SAC_KILL); } @@ -504,4 +504,3 @@ void AddSC_boss_eredar_twins() RegisterSpellScript(spell_eredar_twins_blaze); new AreaTrigger_at_sunwell_eredar_twins(); } - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 141391888..d832b3088 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -173,7 +173,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50)) + if (victim->IsPlayer() && roll_chance_i(50)) Talk(YELL_KILL); } @@ -565,4 +565,3 @@ void AddSC_boss_felmyst() RegisterSpellScript(spell_felmyst_fog_of_corruption_charm_aura); RegisterSpellScript(spell_felmyst_open_brutallus_back_doors); } - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 306e758c9..ea6b27523 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -229,7 +229,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50)) + if (victim->IsPlayer() && roll_chance_i(50)) Talk(SAY_EVIL_SLAY); } @@ -539,7 +539,7 @@ public: void KilledUnit(Unit* target) override { - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) Talk(SAY_SATH_SLAY); } @@ -758,4 +758,3 @@ void AddSC_boss_kalecgos() RegisterSpellScript(spell_kalecgos_spectral_realm_dummy); RegisterSpellScript(spell_kalecgos_spectral_realm_aura); } - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index ba31822e9..163b60d6d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -364,7 +364,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && events.GetNextEventTime(EVENT_NO_KILL_TALK) == 0) + if (victim->IsPlayer() && events.GetNextEventTime(EVENT_NO_KILL_TALK) == 0) Talk(SAY_KJ_SLAY); } @@ -1262,4 +1262,3 @@ void AddSC_boss_kiljaeden() RegisterSpellScript(spell_kiljaeden_armageddon_missile); RegisterSpellScript(spell_kiljaeden_dragon_breath); } - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 1205691d3..03268f04e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -485,4 +485,3 @@ void AddSC_boss_muru() RegisterSpellScript(spell_entropius_void_zone_visual_aura); RegisterSpellScript(spell_entropius_black_hole_effect); } - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 66a5a8926..20ef8f39b 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -299,4 +299,3 @@ void AddSC_instance_sunwell_plateau() new instance_sunwell_plateau(); RegisterSpellScript(spell_cataclysm_breath); } - diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 32d9613a7..7e597eada 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -253,4 +253,3 @@ void AddSC_instance_uldaman() new spell_uldaman_stoned(); new spell_uldaman_boss_agro_archaedas(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 84fcd4a2a..ffdb70f6f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -135,7 +135,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(SAY_KILL); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 8f6f20e62..1f7a65d21 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -996,4 +996,3 @@ void AddSC_boss_hex_lord_malacrass() new boss_alyson_antille(); new spell_hexlord_unstable_affliction(); } - diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index da0969143..1f9e44d78 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -420,7 +420,7 @@ public: void SpellHit(Unit* caster, SpellInfo const* spell) override { - if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == NPC_FOREST_FROG) + if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->IsPlayer() && me->GetEntry() == NPC_FOREST_FROG) { me->GetMotionMaster()->MoveIdle(); me->SetFacingToObject(caster); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index 2da3f6f0b..417141581 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -202,4 +202,3 @@ void AddSC_boss_gahzranka() RegisterSpellScript(spell_gahzranka_slam); RegisterSpellScript(spell_pagles_point_cast); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 9efa0e05d..78bd787c7 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -413,4 +413,3 @@ void AddSC_boss_hakkar() RegisterSpellScript(spell_blood_siphon); RegisterSpellScript(spell_hakkar_power_down); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index 280012a91..ef61c5a10 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -169,4 +169,3 @@ void AddSC_boss_hazzarah() RegisterZulGurubCreatureAI(boss_hazzarah); RegisterSpellScript(spell_chain_burn); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index f8423179e..c750fd59c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -423,4 +423,3 @@ void AddSC_boss_jeklik() RegisterCreatureAI(npc_batrider); RegisterSpellScript(spell_batrider_bomb); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index df53548a1..57b2321d6 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -322,4 +322,3 @@ void AddSC_boss_jindo() RegisterSpellScript(spell_random_aggro); RegisterSpellScript(spell_delusions_of_jindo); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 4b5049da4..1d14f0ff0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -802,4 +802,3 @@ void AddSC_boss_mandokir() RegisterSpellScript(spell_mandokir_charge); RegisterSpellScript(spell_threatening_gaze_charge); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 0b1368092..60ae3fa1c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -299,7 +299,7 @@ class spell_enveloping_webs : public SpellScript { Unit* caster = GetCaster(); Unit* hitUnit = GetHitUnit(); - if (caster && hitUnit && hitUnit->GetTypeId() == TYPEID_PLAYER) + if (caster && hitUnit && hitUnit->IsPlayer()) { caster->GetThreatMgr().ModifyThreatByPercent(hitUnit, -100); } @@ -343,4 +343,3 @@ void AddSC_boss_marli() RegisterSpellScript(spell_enveloping_webs); RegisterSpellScript(spell_marli_transform); } - diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp index fd25a4e76..4c251af6a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp @@ -56,4 +56,3 @@ void AddSC_zulgurub() { RegisterSpellScript(spell_axe_flurry); } - diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 2accdfa58..a0a49c5dd 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -75,7 +75,7 @@ struct boss_twilight_corrupter : public ScriptedAI void MoveInLineOfSight(Unit* who) override { - if (!_introSpoken && who->GetTypeId() == TYPEID_PLAYER) + if (!_introSpoken && who->IsPlayer()) { _introSpoken = true; Talk(SAY_RESPAWN, who); @@ -102,7 +102,7 @@ struct boss_twilight_corrupter : public ScriptedAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_KILL, victim); DoCastSelf(SPELL_SWELL_OF_SOULS); diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index d6bd6de41..6bff7a27d 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -499,7 +499,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (!announced && who->GetTypeId() == TYPEID_PLAYER && who->GetPositionZ() < 30.0f) + if (!announced && who->IsPlayer() && who->GetPositionZ() < 30.0f) { announced = true; playerGUID = who->GetGUID(); @@ -687,4 +687,3 @@ void AddSC_isle_of_queldanas() // THEIR: new npc_greengill_slave(); } - diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index 1b4f06fe1..976162d5f 100644 --- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp @@ -109,7 +109,7 @@ public: m_uiPhase = 1; - if (pDoneBy->GetTypeId() == TYPEID_PLAYER) + if (pDoneBy->IsPlayer()) { m_uiPlayerGUID = pDoneBy->GetGUID(); } @@ -118,7 +118,7 @@ public: if (Unit* owner = pDoneBy->GetOwner()) { // not sure if this is needed. - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) { m_uiPlayerGUID = owner->GetGUID(); } diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index 9dcb005c5..b04f32701 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -68,7 +68,7 @@ struct npc_brewfest_keg_thrower : public ScriptedAI void MoveInLineOfSight(Unit* who) override { - if (me->GetDistance(who) < 10.0f && who->GetTypeId() == TYPEID_PLAYER && who->GetMountID() == RAM_DISPLAY_ID) + if (me->GetDistance(who) < 10.0f && who->IsPlayer() && who->GetMountID() == RAM_DISPLAY_ID) { if (!who->ToPlayer()->HasItemCount(ITEM_PORTABLE_BREWFEST_KEG)) // portable brewfest keg me->CastSpell(who, SPELL_THROW_KEG, true); // throw keg @@ -90,7 +90,7 @@ struct npc_brewfest_keg_reciver : public ScriptedAI void MoveInLineOfSight(Unit* who) override { - if (me->GetDistance(who) < 10.0f && who->GetTypeId() == TYPEID_PLAYER && who->GetMountID() == RAM_DISPLAY_ID) + if (me->GetDistance(who) < 10.0f && who->IsPlayer() && who->GetMountID() == RAM_DISPLAY_ID) { Player* player = who->ToPlayer(); if (player->HasItemCount(ITEM_PORTABLE_BREWFEST_KEG)) // portable brewfest keg @@ -149,7 +149,7 @@ struct npc_brewfest_bark_trigger : public ScriptedAI void MoveInLineOfSight(Unit* who) override { - if (me->GetDistance(who) < 10.0f && who->GetTypeId() == TYPEID_PLAYER && who->GetMountID() == RAM_DISPLAY_ID) + if (me->GetDistance(who) < 10.0f && who->IsPlayer() && who->GetMountID() == RAM_DISPLAY_ID) { bool allow = false; uint32 quest = 0; diff --git a/src/server/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp index 08f402f83..9fbeed766 100644 --- a/src/server/scripts/Events/love_in_air.cpp +++ b/src/server/scripts/Events/love_in_air.cpp @@ -62,7 +62,7 @@ struct npc_love_in_air_supply_sentry : public ScriptedAI void MoveInLineOfSight(Unit* who) override { - if (lock > 1000 && me->GetDistance(who) < 10.0f && who->GetTypeId() == TYPEID_PLAYER && who->HasAura(SPELL_GOBLIN_DISGUISE) && !who->HasAura(SPELL_GOBLIN_CARRY_CRATE)) + if (lock > 1000 && me->GetDistance(who) < 10.0f && who->IsPlayer() && who->HasAura(SPELL_GOBLIN_DISGUISE) && !who->HasAura(SPELL_GOBLIN_CARRY_CRATE)) { lock = 0; if (urand(0, 1)) @@ -135,7 +135,7 @@ struct npc_love_in_air_snivel : public NullCreatureAI void MoveInLineOfSight(Unit* who) override { - if (delay == 0 && me->GetDistance(who) < 7.0f && who->GetTypeId() == TYPEID_PLAYER) + if (delay == 0 && me->GetDistance(who) < 7.0f && who->IsPlayer()) { Player* plr = who->ToPlayer(); if (AllowAction(plr)) @@ -454,7 +454,7 @@ class spell_gen_aura_service_uniform : public AuraScript { // Apply model goblin Unit* target = GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { if (target->getGender() == GENDER_MALE) { @@ -472,7 +472,7 @@ class spell_gen_aura_service_uniform : public AuraScript void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->RestoreDisplayId(); } @@ -496,4 +496,3 @@ void AddSC_event_love_in_the_air() RegisterSpellScript(spell_love_is_in_the_air_romantic_picnic); RegisterSpellScript(spell_gen_aura_service_uniform); } - diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 57e669047..3e4eacfc1 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -437,7 +437,7 @@ struct npc_midsummer_torch_target : public ScriptedAI if (posVec.empty()) return; // Triggered spell from torch - if (spellInfo->Id == SPELL_TORCH_TOSS_LAND && caster->GetTypeId() == TYPEID_PLAYER) + if (spellInfo->Id == SPELL_TORCH_TOSS_LAND && caster->IsPlayer()) { me->CastSpell(me, SPELL_BRAZIERS_HIT_VISUAL, true); // hit visual anim if (++counter >= maxCount) @@ -906,12 +906,12 @@ class spell_midsummer_ribbon_pole : public AuraScript target->CastSpell(target, SPELL_RIBBON_POLE_XP, true); // Achievement - if ((GameTime::GetGameTime().count() - GetApplyTime()) > 60 && target->GetTypeId() == TYPEID_PLAYER) + if ((GameTime::GetGameTime().count() - GetApplyTime()) > 60 && target->IsPlayer()) target->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 58934, 0, target); } // Achievement - if ((time(nullptr) - GetApplyTime()) > 60 && target->GetTypeId() == TYPEID_PLAYER) + if ((time(nullptr) - GetApplyTime()) > 60 && target->IsPlayer()) target->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 58934, 0, target); } } @@ -1308,4 +1308,3 @@ void AddSC_event_midsummer_scripts() RegisterSpellScript(spell_midsummer_torch_catch); RegisterSpellScript(spell_midsummer_summon_ahune_lieutenant); } - diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp index e3386ca53..86e7ed523 100644 --- a/src/server/scripts/Events/pilgrims_bounty.cpp +++ b/src/server/scripts/Events/pilgrims_bounty.cpp @@ -118,7 +118,7 @@ struct npc_pilgrims_bounty_chair : public VehicleAI void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override { - if (apply && who->GetTypeId() == TYPEID_PLAYER) + if (apply && who->IsPlayer()) who->ToPlayer()->SetClientControl(me, 0, true); } @@ -683,4 +683,3 @@ void AddSC_event_pilgrims_end_scripts() new achievement_pb_pilgrims_peril(); new achievement_pb_terokkar_turkey_time(); } - diff --git a/src/server/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp index c87f5c2bb..ddd027e1a 100644 --- a/src/server/scripts/Events/winter_veil.cpp +++ b/src/server/scripts/Events/winter_veil.cpp @@ -266,4 +266,3 @@ void AddSC_event_winter_veil_scripts() RegisterSpellScript(spell_winter_veil_racer_slam_hit); RegisterSpellScript(spell_winter_veil_shoot_air_rifle); } - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 73accd7f7..3d15d6cf7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -508,4 +508,3 @@ void AddSC_boss_archimonde() RegisterHyjalAI(npc_ancient_wisp); RegisterHyjalAI(npc_doomfire_spirit); } - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 09003b022..42ad0d907 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -181,4 +181,3 @@ void AddSC_boss_kazrogal() RegisterHyjalAI(boss_kazrogal); RegisterSpellAndAuraScriptPair(spell_mark_of_kazrogal, spell_mark_of_kazrogal_aura); } - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 3919e5119..f0228eec2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -192,4 +192,3 @@ void AddSC_boss_salramm() new boss_salramm(); RegisterSpellScript(spell_boss_salramm_steal_flesh_aura); } - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 2c5516ddd..4dcd08647 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1550,7 +1550,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (!allowTimer && !locked && (who->GetTypeId() == TYPEID_PLAYER || who->IsPet()) && me->GetDistance(who) < 15.0f) + if (!allowTimer && !locked && (who->IsPlayer() || who->IsPet()) && me->GetDistance(who) < 15.0f) InfectMe(2000); ScriptedAI::MoveInLineOfSight(who); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 2bf4030a5..a47a8b90f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -68,7 +68,7 @@ struct boss_epoch_hunter : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_SLAY); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp index 99c4cbfa3..a00d4276c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp @@ -91,7 +91,7 @@ struct boss_lieutenant_drake : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_SLAY); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 1955c3b5d..f80ed1b28 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -130,7 +130,7 @@ struct npc_medivh_bm : public ScriptedAI return; } - if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 20.0f)) + if (who->IsPlayer() && me->IsWithinDistInMap(who, 20.0f)) { Talk(SAY_MEDIVH_ENTER); _instance->SetData(DATA_MEDIVH, 1); @@ -475,4 +475,3 @@ void AddSC_the_black_morass() RegisterSpellScript(spell_black_morass_corrupt_medivh); } - diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 663805fd9..d36cf4718 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -45,9 +45,9 @@ enum Spells SPELL_HIVEZARA_SWARMER_TELEPORT_5 = 25828, SPELL_HIVEZARA_SWARMER_TELEPORT_TRIGGER = 25830, SPELL_HIVEZARA_SWARMER_START_LOOP = 25711, - SPELL_HIVEZARA_SWARMER_LOOP_1 = 25833, - SPELL_HIVEZARA_SWARMER_LOOP_2 = 25834, - SPELL_HIVEZARA_SWARMER_LOOP_3 = 25835, + SPELL_HZ_SWARMER_LOOP_1 = 25833, + SPELL_HZ_SWARMER_LOOP_2 = 25834, + SPELL_HZ_SWARMER_LOOP_3 = 25835, SPELL_HIVEZARA_SWARMER_SWARM = 25844 }; @@ -105,16 +105,13 @@ struct boss_ayamiss : public BossAI void JustSummoned(Creature* who) override { - switch (who->GetEntry()) + if (who->GetEntry() == NPC_HIVEZARA_SWARMER) { - case NPC_HIVEZARA_SWARMER: - who->CastSpell(who, SPELL_HIVEZARA_SWARMER_TELEPORT_TRIGGER, true); - _swarmers.push_back(who->GetGUID()); - break; - case NPC_HIVEZARA_LARVA: - who->GetMotionMaster()->MovePoint(POINT_PARALYZE, AltarPos); - break; + who->CastSpell(who, SPELL_HIVEZARA_SWARMER_TELEPORT_TRIGGER, true); + _swarmers.push_back(who->GetGUID()); } + else if (who->GetEntry() == NPC_HIVEZARA_LARVA) + who->GetMotionMaster()->MovePoint(POINT_PARALYZE, AltarPos); summons.Summon(who); } @@ -122,9 +119,7 @@ struct boss_ayamiss : public BossAI void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == POINT_AIR) - { me->AddUnitState(UNIT_STATE_ROOT); - } else if (type == WAYPOINT_MOTION_TYPE && id == POINT_GROUND) { me->SetCombatMovement(true); @@ -133,10 +128,7 @@ struct boss_ayamiss : public BossAI me->m_Events.AddEventAtOffset([this]() { me->SetReactState(REACT_AGGRESSIVE); - if (me->GetVictim()) - { - me->GetMotionMaster()->MoveChase(me->GetVictim()); - } + me->ResumeChasingVictim(); }, 1s); @@ -164,9 +156,7 @@ struct boss_ayamiss : public BossAI DoCastAOE(SPELL_SUMMON_HIVEZARA_SWARMER, true); if (_swarmers.size() >= MAX_SWARMER_COUNT) - { DoCastAOE(SPELL_HIVEZARA_SWARMER_SWARM, true); - } context.Repeat(RAND(2400ms, 3600ms)); }).Schedule(15s, 28s, [this](TaskContext context) { @@ -185,15 +175,9 @@ struct boss_ayamiss : public BossAI if (action == ACTION_SWARMER_SWARM) { for (ObjectGuid const& guid : _swarmers) - { if (Creature* swarmer = me->GetMap()->GetCreature(guid)) - { if (Unit* target = SelectTarget(SelectTargetMethod::Random)) - { swarmer->AI()->AttackStart(target); - } - } - } _swarmers.clear(); } @@ -231,17 +215,14 @@ struct npc_hive_zara_larva : public ScriptedAI npc_hive_zara_larva(Creature* creature) : ScriptedAI(creature) { _instance = me->GetInstanceScript(); + me->SetReactState(REACT_PASSIVE); } void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == POINT_PARALYZE) - { if (Player* target = ObjectAccessor::GetPlayer(*me, _instance->GetGuidData(DATA_PARALYZED))) - { DoCast(target, SPELL_FEED); - } - } } void JustSummoned(Creature* summon) override @@ -253,29 +234,6 @@ struct npc_hive_zara_larva : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) override - { - if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) - return; - - ScriptedAI::MoveInLineOfSight(who); - } - - void AttackStart(Unit* victim) override - { - if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) - return; - - ScriptedAI::AttackStart(victim); - } - - void UpdateAI(uint32 diff) override - { - if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) - return; - - ScriptedAI::UpdateAI(diff); - } private: InstanceScript* _instance; }; @@ -369,7 +327,7 @@ class spell_ayamiss_swarmer_start_loop : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_HIVEZARA_SWARMER_LOOP_1, SPELL_HIVEZARA_SWARMER_LOOP_2, SPELL_HIVEZARA_SWARMER_LOOP_3 }); + return ValidateSpellInfo({ SPELL_HZ_SWARMER_LOOP_1, SPELL_HZ_SWARMER_LOOP_2, SPELL_HZ_SWARMER_LOOP_3 }); } bool Load() override @@ -379,8 +337,7 @@ class spell_ayamiss_swarmer_start_loop : public SpellScript void HandleScript(SpellEffIndex /*effIndex*/) { - uint32 loopSpells[3] = { SPELL_HIVEZARA_SWARMER_LOOP_1, SPELL_HIVEZARA_SWARMER_LOOP_2, SPELL_HIVEZARA_SWARMER_LOOP_3 }; - GetCaster()->CastSpell((Unit*)nullptr, Acore::Containers::SelectRandomContainerElement(loopSpells)); + GetCaster()->GetAI()->DoCastAOE(RAND(SPELL_HZ_SWARMER_LOOP_1, SPELL_HZ_SWARMER_LOOP_2, SPELL_HZ_SWARMER_LOOP_3)); } void Register() override @@ -428,4 +385,3 @@ void AddSC_boss_ayamiss() RegisterSpellScriptWithArgs(spell_gen_ayamiss_swarmer_loop, "spell_gen_ayamiss_swarmer_loop_2", (NPC_HIVEZARA_SWARMER + 6) * 10); RegisterSpellScriptWithArgs(spell_gen_ayamiss_swarmer_loop, "spell_gen_ayamiss_swarmer_loop_3", (NPC_HIVEZARA_SWARMER + 7) * 10); } - diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 94311442c..fa7c56048 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -106,7 +106,7 @@ struct boss_buru : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) ChaseNewVictim(); } @@ -270,4 +270,3 @@ void AddSC_boss_buru() RegisterRuinsOfAhnQirajCreatureAI(npc_buru_egg); RegisterSpellScript(spell_egg_explosion); } - diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index ab12a3e82..4abfcac1d 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -204,4 +204,3 @@ void AddSC_boss_moam() RegisterSpellScript(spell_moam_mana_drain_filter); RegisterSpellScript(spell_moam_summon_mana_fiends); } - diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index 8b6646486..b82a2cd6e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -382,4 +382,3 @@ void AddSC_boss_rajaxx() RegisterSpellScript(spell_rajaxx_thundercrash); RegisterRuinsOfAhnQirajCreatureAI(npc_general_andorov); } - diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp index 6a3acc6b8..06bf51b24 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp @@ -161,4 +161,3 @@ void AddSC_ruins_of_ahnqiraj() RegisterRuinsOfAhnQirajCreatureAI(npc_obsidian_destroyer); RegisterSpellScript(spell_drain_mana); } - diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index d4b5e39ec..184037492 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -498,4 +498,3 @@ void AddSC_bug_trio() RegisterSpellScript(spell_vem_knockback); RegisterSpellScript(spell_vem_vengeance); } - diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 2bbbc4bc5..0162d8cbb 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -22,12 +22,6 @@ #include "SpellScript.h" #include "SpellScriptLoader.h" #include "temple_of_ahnqiraj.h" -/* ScriptData -SDName: Boss_Cthun -SD%Complete: 95 -SDComment: Darkglare tracking issue -SDCategory: Temple of Ahn'Qiraj -EndScriptData */ enum Spells { @@ -82,9 +76,7 @@ enum Spells enum Actions { ACTION_FLESH_TENTACLE_KILLED = 1, - ACTION_SPAWN_EYE_TENTACLES = 1, - ACTION_START_PHASE_TWO = 1, }; @@ -116,13 +108,8 @@ enum Yells RANDOM_SOUND_WHISPER = 8663, }; -//Stomach Teleport positions -#define STOMACH_X -8562.0f -#define STOMACH_Y 2037.0f -#define STOMACH_Z -70.0f -#define STOMACH_O 5.05f +const Position StomachPosition = { -8562.0f, 2037.0f, -70.0f, 5.05f }; -//Flesh tentacle positions const Position FleshTentaclePos[2] = { { -8571.0f, 1990.0f, -98.0f, 1.22f}, @@ -165,9 +152,8 @@ struct boss_eye_of_cthun : public BossAI me->SetVisible(true); //to avoid having a following void zone - Creature* pPortal = me->FindNearestCreature(NPC_CTHUN_PORTAL, 10); - if (pPortal) - pPortal->SetReactState(REACT_PASSIVE); + if (Creature* portal = me->FindNearestCreature(NPC_CTHUN_PORTAL, 10.0f)) + portal->SetReactState(REACT_PASSIVE); BossAI::Reset(); } @@ -175,9 +161,7 @@ struct boss_eye_of_cthun : public BossAI void JustDied(Unit* /*killer*/) override { if (Creature* cthun = instance->GetCreature(DATA_CTHUN)) - { cthun->AI()->DoAction(ACTION_START_PHASE_TWO); - } } void JustEngagedWith(Unit* who) override @@ -189,13 +173,11 @@ struct boss_eye_of_cthun : public BossAI void MoveInLineOfSight(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER && !me->IsInCombat()) + if (who->IsPlayer() && !me->IsInCombat()) { // Z checks are necessary here because AQ maps do funky stuff. if (me->IsWithinLOSInMap(who) && me->IsWithinDist2d(who, 90.0f) && who->GetPositionZ() > 100.0f) - { AttackStart(who); - } } } @@ -207,9 +189,7 @@ struct boss_eye_of_cthun : public BossAI _eyeTentacleCounter++; if (_eyeTentacleCounter >= MAX_TENTACLE_GROUPS) - { _eyeTentacleCounter = 0; - } } } @@ -218,9 +198,7 @@ struct boss_eye_of_cthun : public BossAI summons.Summon(summon); if (Creature* cthun = instance->GetCreature(DATA_CTHUN)) - { cthun->AI()->JustSummoned(summon); - } } void ScheduleTask(bool onEngage = false) @@ -231,9 +209,7 @@ struct boss_eye_of_cthun : public BossAI if (task.GetRepeatCounter() < 3 && onEngage) { if (Unit* target = ObjectAccessor::GetUnit(*me, _beamTarget)) - { DoCast(target, SPELL_GREEN_BEAM); - } task.Repeat(); } @@ -257,12 +233,8 @@ struct boss_eye_of_cthun : public BossAI .Schedule(8s, [this](TaskContext task) { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) - { if (Creature* tentacle = me->SummonCreature(NPC_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000)) - { tentacle->AI()->AttackStart(target); - } - } task.SetGroup(GROUP_BEAM_PHASE); task.Repeat(); @@ -283,7 +255,7 @@ struct boss_eye_of_cthun : public BossAI me->SetTarget(ObjectGuid::Empty); //Freeze animation - DoCast(me, SPELL_FREEZE_ANIM, true); + DoCastSelf(SPELL_FREEZE_ANIM, true); scheduler.Schedule(1s, [this](TaskContext /*task*/) { @@ -294,7 +266,7 @@ struct boss_eye_of_cthun : public BossAI ClockWise = RAND(true, false); //Add red coloration to C'thun - DoCast(me, SPELL_RED_COLORATION, true); + DoCastSelf(SPELL_RED_COLORATION, true); me->StopMoving(); me->SetOrientation(DarkGlareAngle); @@ -357,9 +329,8 @@ struct boss_eye_of_cthun : public BossAI me->m_Events.AddEventAtOffset([this]() { if (Creature* cthun = instance->GetCreature(DATA_CTHUN)) - { cthun->AI()->DoAction(ACTION_START_PHASE_TWO); - } + }, 3s); } @@ -415,10 +386,8 @@ struct boss_cthun : public BossAI }, 500ms); //Spawn flesh tentacle - for (uint8 i = 0; i < 2; i++) - { - me->SummonCreature(NPC_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); - } + for (const auto& position : FleshTentaclePos) + me->SummonCreature(NPC_FLESH_TENTACLE, position, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); ScheduleTasks(); } @@ -434,7 +403,7 @@ struct boss_cthun : public BossAI target->m_Events.AddEventAtOffset([target, this]() { - DoTeleportPlayer(target, STOMACH_X, STOMACH_Y, STOMACH_Z, STOMACH_O); + DoTeleportPlayer(target, StomachPosition); target->RemoveAurasDueToSpell(SPELL_MIND_FLAY); target->m_Events.AddEventAtOffset([target, this]() @@ -448,33 +417,21 @@ struct boss_cthun : public BossAI }).Schedule(30s, [this](TaskContext context) { if (Creature* eye = instance->GetCreature(DATA_EYE_OF_CTHUN)) - { eye->AI()->DoAction(ACTION_SPAWN_EYE_TENTACLES); - } - context.Repeat(30s); + context.Repeat(); }).Schedule(8s, [this](TaskContext context) { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NotInStomachSelector())) - { - //Spawn claw tentacle on the random target if (Creature* spawned = me->SummonCreature(NPC_GIANT_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000)) - { spawned->AI()->AttackStart(target); - } - } context.Repeat(1min); }).Schedule(38s, [this](TaskContext context) { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NotInStomachSelector())) - { - //Spawn claw tentacle on the random target if (Creature* spawned = me->SummonCreature(NPC_GIANT_EYE_TENTACLE, *target, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000)) - { spawned->AI()->AttackStart(target); - } - } context.Repeat(1min); }); @@ -486,24 +443,13 @@ struct boss_cthun : public BossAI if (!UpdateVictim()) { //No target so we'll use this section to do our random wispers instance wide - //WisperTimer if (WisperTimer <= diff) { - Map* map = me->GetMap(); - if (!map->IsDungeon()) - return; - //Play random sound to the zone - Map::PlayerList const& PlayerList = map->GetPlayers(); - - if (!PlayerList.IsEmpty()) + me->GetMap()->DoForAllPlayers([&](Player* player) { - for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) - { - if (Player* pPlr = itr->GetSource()) - pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER, pPlr); - } - } + player->PlayDirectSound(RANDOM_SOUND_WHISPER, player); + }); //One random wisper every 90 - 300 seconds WisperTimer = urand(90000, 300000); @@ -523,14 +469,10 @@ struct boss_cthun : public BossAI BossAI::JustDied(killer); if (Creature* pPortal = me->FindNearestCreature(NPC_CTHUN_PORTAL, 10.0f)) - { pPortal->DespawnOrUnsummon(); - } if (Creature* eye = instance->GetCreature(DATA_EYE_OF_CTHUN)) - { eye->DespawnOrUnsummon(); - } } void SummonedCreatureDies(Creature* creature, Unit* /*killer*/) override @@ -549,7 +491,7 @@ struct boss_cthun : public BossAI Talk(EMOTE_WEAKENED); - DoCast(me, SPELL_PURPLE_COLORATION, true); + DoCastSelf(SPELL_PURPLE_COLORATION, true); me->RemoveAurasDueToSpell(SPELL_CARAPACE_CTHUN); scheduler.Schedule(45s, [this](TaskContext /*context*/) @@ -559,10 +501,8 @@ struct boss_cthun : public BossAI me->RemoveAurasDueToSpell(SPELL_PURPLE_COLORATION); DoCastSelf(SPELL_CARAPACE_CTHUN, true); //Spawn flesh tentacle - for (uint8 i = 0; i < 2; i++) - { - me->SummonCreature(NPC_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); - } + for (const auto& position : FleshTentaclePos) + me->SummonCreature(NPC_FLESH_TENTACLE, position, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); }); } } @@ -586,15 +526,9 @@ struct npc_eye_tentacle : public ScriptedAI _portalGUID = portal->GetGUID(); if (me->ToTempSummon()) - { if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit()) - { if (Creature* creature = summoner->ToCreature()) - { creature->AI()->JustSummoned(portal); - } - } - } } me->SetCombatMovement(false); @@ -602,10 +536,8 @@ struct npc_eye_tentacle : public ScriptedAI void JustDied(Unit* /*killer*/) override { - if (Unit* p = ObjectAccessor::GetUnit(*me, _portalGUID)) - { - Unit::Kill(p, p); - } + if (Unit* portal = ObjectAccessor::GetUnit(*me, _portalGUID)) + portal->KillSelf(); } void Reset() override @@ -626,9 +558,7 @@ struct npc_eye_tentacle : public ScriptedAI scheduler.Schedule(1s, 5s, [this](TaskContext context) { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NotInStomachSelector())) - { DoCast(target, SPELL_MIND_FLAY); - } context.Repeat(10s, 15s); }); @@ -659,24 +589,16 @@ struct npc_claw_tentacle : public ScriptedAI _portalGUID = portal->GetGUID(); if (me->ToTempSummon()) - { if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit()) - { if (Creature* creature = summoner->ToCreature()) - { creature->AI()->JustSummoned(portal); - } - } - } } } void JustDied(Unit* /*killer*/) override { - if (Unit* p = ObjectAccessor::GetUnit(*me, _portalGUID)) - { - Unit::Kill(p, p); - } + if (Unit* portal = ObjectAccessor::GetUnit(*me, _portalGUID)) + portal->KillSelf(); } void Reset() override @@ -728,15 +650,9 @@ struct npc_giant_claw_tentacle : public ScriptedAI _portalGUID = portal->GetGUID(); if (me->ToTempSummon()) - { if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit()) - { if (Creature* creature = summoner->ToCreature()) - { creature->AI()->JustSummoned(portal); - } - } - } } _canAttack = false; @@ -744,10 +660,8 @@ struct npc_giant_claw_tentacle : public ScriptedAI void JustDied(Unit* /*killer*/) override { - if (Unit* p = ObjectAccessor::GetUnit(*me, _portalGUID)) - { - Unit::Kill(p, p); - } + if (Unit* portal = ObjectAccessor::GetUnit(*me, _portalGUID)) + portal->KillSelf(); } void Reset() override @@ -770,20 +684,14 @@ struct npc_giant_claw_tentacle : public ScriptedAI scheduler.Schedule(10s, [this](TaskContext task) { if (Unit* target = me->GetVictim()) - { if (!target->IsWithinMeleeRange(me)) { // Main target not found within melee range, try to select a new one if (Player* newTarget = me->SelectNearestPlayer(5.0f)) - { AttackStart(newTarget); - } else // Main target not found, and failed to acquire a new target... Submerge - { Submerge(); - } } - } task.Repeat(); }).Schedule(2s, [this](TaskContext context) @@ -809,9 +717,7 @@ struct npc_giant_claw_tentacle : public ScriptedAI // Despawn portal if (Creature* p = ObjectAccessor::GetCreature(*me, _portalGUID)) - { p->DespawnOrUnsummon(); - } DoCastSelf(SPELL_SUBMERGE_VISUAL); me->SetHealth(me->GetMaxHealth()); @@ -878,24 +784,16 @@ struct npc_giant_eye_tentacle : public ScriptedAI _portalGUID = portal->GetGUID(); if (me->ToTempSummon()) - { if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit()) - { if (Creature* creature = summoner->ToCreature()) - { creature->AI()->JustSummoned(portal); - } - } - } } } void JustDied(Unit* /*killer*/) override { - if (Unit* p = ObjectAccessor::GetUnit(*me, _portalGUID)) - { - Unit::Kill(p, p); - } + if (Unit* portal = ObjectAccessor::GetUnit(*me, _portalGUID)) + portal->KillSelf(); } void Reset() override @@ -906,9 +804,7 @@ struct npc_giant_eye_tentacle : public ScriptedAI }).Schedule(1s, 5s, [this](TaskContext context) { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NotInStomachSelector())) - { DoCast(target, SPELL_GREEN_BEAM); - } context.Repeat(2100ms); }); @@ -955,12 +851,8 @@ class spell_cthun_digestive_acid : public AuraScript void OnPeriodic(AuraEffect const* /*aurEff*/) { if (InstanceScript* instance = GetUnitOwner()->GetInstanceScript()) - { if (Creature* cthun = instance->GetCreature(DATA_CTHUN)) - { cthun->CastSpell(GetUnitOwner(), SPELL_DIGESTIVE_ACID, true); - } - } } void Register() override @@ -986,9 +878,7 @@ public: trigger->CastSpell(player, SPELL_EXIT_STOMACH, true); if (Creature* exittrigger = player->FindNearestCreature(NPC_EXIT_TRIGGER, 15.0f)) - { exittrigger->CastSpell(player, SPELL_RUBBLE_ROCKY, true); - } } player->m_Events.AddEventAtOffset([player, cthun]() @@ -1000,9 +890,7 @@ public: player->m_Events.AddEventAtOffset([player, cthun]() { if (cthun) - { player->NearTeleportTo(cthun->GetPositionX(), cthun->GetPositionY(), cthun->GetPositionZ() + 10, float(rand32() % 6)); - } player->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); }, 1s); @@ -1027,15 +915,9 @@ public: bool OnTrigger(Player* player, AreaTrigger const* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) - { if (Creature* cthun = instance->GetCreature(DATA_CTHUN)) - { if (cthun->IsAlive()) - { cthun->CastSpell(player, SPELL_SPIT_OUT, true); - } - } - } return true; } @@ -1054,4 +936,3 @@ void AddSC_boss_cthun() new at_cthun_stomach_exit(); new at_cthun_center(); } - diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 943a2d056..9412d504e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -185,4 +185,3 @@ void AddSC_boss_huhuran() RegisterSpellScript(spell_huhuran_wyvern_sting); RegisterSpellScript(spell_huhuran_poison_bolt); } - diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 2f28174f8..e3cc20498 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -75,7 +75,7 @@ struct npc_ouro_spawner : public ScriptedAI void MoveInLineOfSight(Unit* who) override { // Spawn Ouro on LoS check - if (!hasSummoned && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 40.0f) && !who->ToPlayer()->IsGameMaster()) + if (!hasSummoned && who->IsPlayer() && me->IsWithinDistInMap(who, 40.0f) && !who->ToPlayer()->IsGameMaster()) { if (InstanceScript* instance = me->GetInstanceScript()) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index cb8a231a6..19b8315a1 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -261,4 +261,3 @@ void AddSC_boss_skeram() RegisterTempleOfAhnQirajCreatureAI(boss_skeram); RegisterSpellScript(spell_skeram_arcane_explosion); } - diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index d0f96d03b..091bb2837 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -117,7 +117,7 @@ struct boss_twinemperorsAI : public BossAI void KilledUnit(Unit* victim) override { - if (victim && victim->GetTypeId() == TYPEID_PLAYER) + if (victim && victim->IsPlayer()) Talk(SAY_KILL); } @@ -487,4 +487,3 @@ void AddSC_boss_twinemperors() new at_twin_emperors(); RegisterSpellScript(spell_mutate_explode_bug); } - diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index c2cff4eba..a25435689 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -420,4 +420,3 @@ void AddSC_boss_viscidus() RegisterSpellScript(spell_explode_trigger); RegisterSpellScript(spell_summon_toxin_slime); } - diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 09925a7af..f4a2b21bd 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -357,4 +357,3 @@ void AddSC_npc_anubisath_sentinel() RegisterSpellScript(spell_anubisath_mortal_strike); RegisterSpellScript(spell_mana_burn_area); } - diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp index 4c8a68ded..6ed2e8fe2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp @@ -575,4 +575,3 @@ void AddSC_temple_of_ahnqiraj() RegisterSpellScript(spell_nullify); new at_battleguard_sartura(); } - diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index f8c76779b..7d6330b16 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -519,4 +519,3 @@ void AddSC_instance_zulfarrak() RegisterSpellScript(spell_zulfarrak_summon_zulfarrak_zombies); RegisterSpellScript(spell_zulfarrak_unlocking); } - diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 4762a72b6..31e94f04f 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -739,4 +739,3 @@ void AddSC_zulfarrak() new npc_shadowpriest_sezziz(); new go_troll_cage(); } - diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 3ca98843a..bb73f7219 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -77,7 +77,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim && victim->GetTypeId() == TYPEID_PLAYER) + if (victim && victim->IsPlayer()) { Talk(SAY_KILL); victim->CastSpell(victim, SPELL_MARK_OF_FROST, true); @@ -229,4 +229,3 @@ void AddSC_boss_azuregos() RegisterSpellScript(spell_arcane_vacuum); RegisterSpellScript(spell_mark_of_frost_freeze); } - diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index c8fb68c0a..b88ff0e68 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -339,7 +339,7 @@ public: if (!who) return; - if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 5)) + if (who->IsPlayer() && me->IsWithinDistInMap(who, 5)) { DoCast(who, SPELL_DEPTH_CHARGE_TRAP); WeMustDie = true; diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 828f6b390..d9a734b97 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -94,7 +94,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) + if (CanSayHelp && who->IsPlayer() && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) { //Random switch between 4 texts Talk(SAY_HELP, who); @@ -585,4 +585,3 @@ void AddSC_azuremyst_isle() new go_bristlelimb_cage(); RegisterSpellScript(spell_inoculate_nestlewood_owlkin); } - diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index c5a2f55e7..e062e1782 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -70,7 +70,7 @@ public: { if (Unit* owner = killer->GetOwner()) { - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) { owner->ToPlayer()->KilledMonsterCredit(NPC_EXPEDITION_RESEARCHER); } diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index bd243b54c..b7206f9d9 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -478,4 +478,3 @@ void AddSC_durotar() RegisterSpellScript(spell_voljin_war_drums); RegisterSpellScript(spell_voodoo); } - diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 4d391d8b1..802739571 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -99,7 +99,7 @@ class spell_energize_aoe : public SpellScript { for (std::list::iterator itr = targets.begin(); itr != targets.end();) { - if ((*itr)->GetTypeId() == TYPEID_PLAYER && (*itr)->ToPlayer()->GetQuestStatus(GetSpellInfo()->Effects[EFFECT_1].CalcValue()) == QUEST_STATUS_INCOMPLETE) + if ((*itr)->IsPlayer() && (*itr)->ToPlayer()->GetQuestStatus(GetSpellInfo()->Effects[EFFECT_1].CalcValue()) == QUEST_STATUS_INCOMPLETE) ++itr; else targets.erase(itr++); @@ -127,4 +127,3 @@ void AddSC_dustwallow_marsh() RegisterSpellScript(spell_ooze_zap_channel_end); RegisterSpellScript(spell_energize_aoe); } - diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp index 1b70c5485..794f49cab 100644 --- a/src/server/scripts/Kalimdor/zone_feralas.cpp +++ b/src/server/scripts/Kalimdor/zone_feralas.cpp @@ -56,4 +56,3 @@ void AddSC_feralas() { RegisterSpellScript(spell_gordunni_trap); } - diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index 2f2b39fbf..886759de5 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -91,7 +91,7 @@ public: { if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID)) { - if (player->GetTypeId() == TYPEID_PLAYER && player->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) + if (player->IsPlayer() && player->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) player->FailQuest(QUEST_SHATTERED_SALUTE); } Reset(); diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index a011bc2f9..419fe473f 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -121,7 +121,7 @@ public: { if (SendItemTimer <= diff) { - if (me->GetVictim()->GetTypeId() == TYPEID_PLAYER) + if (me->GetVictim()->IsPlayer()) SendItem(me->GetVictim()); SendItemTimer = 5000; } diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index 91ccd664f..4e1ccc999 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -360,4 +360,3 @@ void AddSC_thousand_needles() new npc_plucky(); RegisterSpellScript(spell_panther_cage_key); } - diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 2032efe5d..4408d6f2e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -95,7 +95,7 @@ class boss_anub_arak : public CreatureScript void MoveInLineOfSight(Unit* who) override { - if (!intro && who->GetTypeId() == TYPEID_PLAYER) + if (!intro && who->IsPlayer()) { intro = true; Talk(SAY_INTRO); @@ -304,4 +304,3 @@ void AddSC_boss_anub_arak() RegisterSpellScript(spell_azjol_nerub_pound); RegisterSpellScript(spell_azjol_nerub_impale_summon); } - diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index df442a5ed..50ac54cb8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -415,4 +415,3 @@ void AddSC_boss_hadronox() RegisterSpellScript(spell_hadronox_leech_poison_aura); new achievement_hadronox_denied(); } - diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index f0e2a6858..aab8030fd 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -350,4 +350,3 @@ void AddSC_boss_amanitar() // Spells RegisterSpellScript(spell_amanitar_remove_mushroom_power); } - diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index ff7b04141..914dd5118 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -146,7 +146,7 @@ struct boss_elder_nadox : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_SLAY); } @@ -395,4 +395,3 @@ void AddSC_boss_elder_nadox() // Achievements new achievement_respect_your_elders(); } - diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index b35c57902..54a382f5b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -151,7 +151,7 @@ struct boss_volazj : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { switch (urand(0, 2)) { @@ -504,4 +504,3 @@ void AddSC_boss_volazj() RegisterSpellScript(spell_herald_volzaj_insanity); RegisterSpellScript(spell_volazj_whisper); } - diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 6bd5244fe..934e4b3e7 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -735,4 +735,3 @@ void AddSC_boss_jedoga_shadowseeker() // Achievements new achievement_volunteer_work(); } - diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 9cff13a2b..2bf096992 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -420,7 +420,7 @@ struct boss_taldaram : public BossAI if (reference) { Unit const* pTarget = ObjectAccessor::GetUnit(*me, reference->getUnitGuid()); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->IsAlive()) + if (pTarget && pTarget->IsPlayer() && pTarget->IsAlive()) { ++count; } @@ -549,4 +549,3 @@ void AddSC_boss_taldaram() RegisterSpellScript(spell_prince_taldaram_conjure_flame_sphere); RegisterSpellScript(spell_prince_taldaram_flame_sphere_summon); } - diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index b1388a95d..fe4ad7c8a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -389,7 +389,7 @@ public: void KilledUnit(Unit* pVictim) override { - if (!urand(0, 2) && pVictim->GetTypeId() == TYPEID_PLAYER) + if (!urand(0, 2) && pVictim->IsPlayer()) { Talk(SAY_SARTHARION_SLAY); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 6d099ce61..5dd29389e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -194,4 +194,3 @@ void AddSC_instance_obsidian_sanctum() { new instance_obsidian_sanctum(); } - diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index b240f4484..7e4e3d92a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -308,7 +308,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && events.GetNextEventTime(EVENT_KILL_TALK) == 0) + if (victim->IsPlayer() && events.GetNextEventTime(EVENT_KILL_TALK) == 0) { Talk(SAY_KILL); events.ScheduleEvent(EVENT_KILL_TALK, 6s); @@ -475,7 +475,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && _events.GetNextEventTime(EVENT_KILL_TALK) == 0) + if (victim->IsPlayer() && _events.GetNextEventTime(EVENT_KILL_TALK) == 0) { Talk(SAY_KILL); _events.ScheduleEvent(EVENT_KILL_TALK, 6s); @@ -1358,4 +1358,3 @@ void AddSC_boss_halion() RegisterSpellScript(spell_halion_twilight_division); RegisterSpellScript(spell_halion_twilight_mending); } - diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 7c71bbd3d..539626595 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -229,4 +229,3 @@ void AddSC_boss_saviana_ragefire() RegisterSpellScript(spell_saviana_conflagration_init); RegisterSpellScript(spell_saviana_conflagration_throwback); } - diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index d2659ab54..a0c17eae5 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -276,4 +276,3 @@ void AddSC_instance_ruby_sanctum() new instance_ruby_sanctum(); RegisterSpellScript(spell_ruby_sanctum_rallying_shout); } - diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 10d5cee1b..554ae002c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -116,7 +116,7 @@ public: void KilledUnit(Unit* who) override { - if( who->GetTypeId() == TYPEID_PLAYER ) + if( who->IsPlayer() ) { Talk(SAY_EADRIC_KILL_PLAYER); } @@ -243,7 +243,7 @@ public: void KilledUnit(Unit* who) override { - if( who->GetTypeId() == TYPEID_PLAYER ) + if( who->IsPlayer() ) { Talk(SAY_PALETRESS_KILL_PLAYER); } @@ -822,4 +822,3 @@ void AddSC_boss_argent_challenge() RegisterSpellScript(spell_toc5_light_rain); RegisterSpellScript(spell_reflective_shield_aura); } - diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index dec97a49e..0b2a7ffc5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -305,7 +305,7 @@ public: void KilledUnit(Unit* victim) override { - if( victim->GetTypeId() == TYPEID_PLAYER ) + if( victim->IsPlayer() ) { Talk(SAY_BK_KILL_PLAYER); } @@ -434,7 +434,7 @@ public: } break; case SPELL_EXPLODE_H: - if (target && target->GetTypeId() == TYPEID_PLAYER) + if (target && target->IsPlayer()) if (pInstance) pInstance->SetData(DATA_ACHIEV_IVE_HAD_WORSE, 0); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 1c47e1c8f..746728d3e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -1310,4 +1310,3 @@ void AddSC_instance_trial_of_the_champion() { new instance_trial_of_the_champion(); } - diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 185fedd97..6dfdf56a0 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -385,7 +385,7 @@ public: void KilledUnit(Unit* who) override { - if( who->GetTypeId() == TYPEID_PLAYER ) + if( who->IsPlayer() ) Talk(SAY_KILL_PLAYER); } @@ -955,4 +955,3 @@ void AddSC_boss_anubarak_trial() new spell_gen_leeching_swarm(); new spell_gen_leeching_swarm_dmg(); } - diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 26a49edc7..72aa2abfc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -107,7 +107,7 @@ struct boss_faction_championsAI : public ScriptedAI for( ThreatContainer::StorageType::const_iterator itr = tList.begin(); itr != tList.end(); ++itr ) { Unit* pUnit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()); - if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->GetThreatMgr().GetThreat(pUnit) ) + if( pUnit && pUnit->IsPlayer() && me->GetThreatMgr().GetThreat(pUnit) ) { float threatMod = GetThreatMod(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth(), pUnit->GetMaxHealth(), pUnit); me->GetThreatMgr().ModifyThreatByPercent(pUnit, -100); @@ -2496,4 +2496,3 @@ void AddSC_boss_faction_champions() new npc_toc_pet_hunter(); new spell_faction_champion_warl_unstable_affliction(); } - diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 21be9eb91..7f8d8c6e3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -524,4 +524,3 @@ void AddSC_boss_jaraxxus() new spell_toc25_mistress_kiss(); new spell_mistress_kiss_area(); } - diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index dd88510df..5423cf881 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -161,12 +161,12 @@ public: case 0: break; case EVENT_SPELL_SNOBOLLED: - if( t->GetTypeId() == TYPEID_PLAYER ) + if( t->IsPlayer() ) me->CastSpell((Unit*)nullptr, SPELL_SNOBOLLED, true); break; case EVENT_SPELL_BATTER: - if( t->GetTypeId() == TYPEID_PLAYER ) + if( t->IsPlayer() ) me->CastSpell(t, SPELL_BATTER); events.Repeat(6s, 8s); break; @@ -198,7 +198,7 @@ public: } break; case EVENT_SPELL_HEAD_CRACK: - if( t->GetTypeId() == TYPEID_PLAYER ) + if( t->IsPlayer() ) me->CastSpell(t, SPELL_HEAD_CRACK); events.Repeat(30s, 35s); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 661cab6df..e3f805fb7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -499,7 +499,7 @@ struct boss_twin_valkyrAI : public ScriptedAI void KilledUnit(Unit* who) override { - if( who->GetTypeId() == TYPEID_PLAYER ) + if( who->IsPlayer() ) { Talk(SAY_KILL_PLAYER); if( Creature* twin = GetSister() ) @@ -927,4 +927,3 @@ void AddSC_boss_twin_valkyr() new spell_valkyr_touch(); new spell_valkyr_ball_periodic_dummy(); } - diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 591991e78..7b3ab1688 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -155,7 +155,7 @@ public: void OnUnitDeath(Unit* u) override { - if (bNooneDied && u->GetTypeId() == TYPEID_PLAYER) + if (bNooneDied && u->IsPlayer()) { bNooneDied = false; SaveToDB(); @@ -1694,4 +1694,3 @@ void AddSC_instance_trial_of_the_crusader() { new instance_trial_of_the_crusader(); } - diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index ef883269e..ac241e409 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -284,4 +284,3 @@ void AddSC_boss_tharon_ja() RegisterSpellScript(spell_tharon_ja_dummy_aura); RegisterSpellScript(spell_tharon_ja_clear_gift_of_tharon_ja); } - diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 0ad8fb6bb..3c82020a0 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -86,7 +86,7 @@ public: me->setActive(true); instance->SetBossState(DATA_TROLLGORE, IN_PROGRESS); - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { Talk(SAY_AGGRO); me->SetInCombatWithZone(); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 33595a114..d08cddca6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -190,7 +190,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(SAY_SLAY); } @@ -373,4 +373,3 @@ void AddSC_boss_bronjahm() RegisterSpellScript(spell_bronjahm_soulstorm_visual_aura); RegisterSpellScript(spell_bronjahm_soulstorm_targeting); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 9a870e6a0..70e2fb391 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -371,4 +371,3 @@ void AddSC_boss_devourer_of_souls() new boss_devourer_of_souls(); RegisterSpellScript(spell_wailing_souls_periodic_aura); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 521552dc2..d94ea64d4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -303,4 +303,3 @@ void AddSC_forge_of_souls() new npc_fos_leader_second(); RegisterSpellScript(spell_shield_of_bones_aura); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 6b242b1b9..156a405c7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -219,4 +219,3 @@ void AddSC_instance_forge_of_souls() { new instance_forge_of_souls(); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 14330239f..d5e01c2da 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -161,7 +161,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(SAY_SLAY); } @@ -184,4 +184,3 @@ void AddSC_boss_falric() { new boss_falric(); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 75d715112..ae13defb1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -154,7 +154,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(SAY_SLAY); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 9724ad8d1..a9ee85788 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -1213,4 +1213,3 @@ void AddSC_instance_halls_of_reflection() { new instance_halls_of_reflection(); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index a522b7610..12fc5a6f0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -280,7 +280,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(SAY_SLAY); } @@ -368,4 +368,3 @@ void AddSC_boss_garfrost() RegisterSpellScript(spell_garfrost_permafrost); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 0f46e27e5..d2babe69a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -115,7 +115,7 @@ public: { if (!target || !spell) return; - if (spell->Id == SPELL_PURSUIT && target->GetTypeId() == TYPEID_PLAYER) + if (spell->Id == SPELL_PURSUIT && target->IsPlayer()) { Talk(EMOTE_ICK_CHASE, target); AttackStart(target); @@ -262,7 +262,7 @@ public: if (me->GetReactState() == REACT_PASSIVE) me->SetReactState(REACT_AGGRESSIVE); - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) if (Creature* k = GetKrick()) k->AI()->Talk(SAY_SLAY); } @@ -524,4 +524,3 @@ void AddSC_boss_ick() RegisterSpellScript(spell_krick_explosive_barrage_aura); RegisterSpellScript(spell_exploding_orb_auto_grow_aura); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index acbe71b8a..e49c9ee7a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -209,7 +209,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(SAY_SLAY); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 6d71865c4..3c4c0e7cf 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -409,4 +409,3 @@ void AddSC_instance_pit_of_saron() { new instance_pit_of_saron(); } - diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 35901db4d..3dcfa3e42 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -881,7 +881,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - if (target && spell && target->GetTypeId() == TYPEID_PLAYER && spell->Id == 70827 && pInstance) + if (target && spell && target->IsPlayer() && spell->Id == 70827 && pInstance) pInstance->SetData(DATA_ACHIEV_DONT_LOOK_UP, 0); } @@ -1185,7 +1185,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - if ((spell->Id == SPELL_TELEPORT_JAINA || spell->Id == SPELL_TELEPORT_SYLVANAS) && target && target->GetTypeId() == TYPEID_PLAYER) + if ((spell->Id == SPELL_TELEPORT_JAINA || spell->Id == SPELL_TELEPORT_SYLVANAS) && target && target->IsPlayer()) { float angle = rand_norm() * 2 * M_PI; float dist = urand(1, 4); diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 17f81c164..8a9463b51 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -358,7 +358,7 @@ public: { if (me->ToTempSummon()) { - if (who->GetTypeId() == TYPEID_PLAYER || who->GetOwnerGUID().IsPlayer()) + if (who->IsPlayer() || who->GetOwnerGUID().IsPlayer()) if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit()) summoner->GetAI()->DoAction(ACTION_INFORM); return; @@ -476,4 +476,3 @@ void AddSC_boss_drakkari_colossus() RegisterSpellScript(spell_drakkari_colossus_surge); RegisterSpellScript(spell_drakkari_colossus_face_me); } - diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 11e9cc64b..5111d8799 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -219,4 +219,3 @@ void AddSC_instance_gundrak() { new instance_gundrak(); } - diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 4b519e659..c1193e442 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -352,7 +352,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KELESETH_KILL); } @@ -622,7 +622,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_TALDARAM_KILL); } @@ -916,7 +916,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_VALANAR_KILL); } @@ -1451,7 +1451,7 @@ class spell_blood_council_shadow_prison_aura : public AuraScript void HandleDummyTick(AuraEffect const* aurEff) { - if (GetTarget()->GetTypeId() == TYPEID_PLAYER && GetTarget()->isMoving()) + if (GetTarget()->IsPlayer() && GetTarget()->isMoving()) { GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_PRISON_DAMAGE, true, nullptr, aurEff); } @@ -1710,4 +1710,3 @@ void AddSC_boss_blood_prince_council() RegisterSpellScript(spell_valanar_kinetic_bomb_summon); RegisterSpellScript(spell_blood_council_summon_shadow_resonance); } - diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 3b1dd9843..7686841c6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -268,7 +268,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 08058a970..eb84105c7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -341,7 +341,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index de01ce804..0073e7cb5 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -162,7 +162,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 5edeaa542..cac357457 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -2018,7 +2018,7 @@ class spell_igb_rocket_pack_useable_aura : public AuraScript bool CheckAreaTarget(Unit* target) { - return target->GetTypeId() == TYPEID_PLAYER && GetOwner()->GetInstanceScript()->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != DONE; + return target->IsPlayer() && GetOwner()->GetInstanceScript()->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != DONE; } void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -2571,7 +2571,7 @@ class spell_igb_on_gunship_deck_aura : public AuraScript bool CheckAreaTarget(Unit* unit) { - return unit->GetTypeId() == TYPEID_PLAYER; + return unit->IsPlayer(); } void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 4e28ec371..cc36837f7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -544,7 +544,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index b27a314ad..17d68df61 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -285,13 +285,13 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } void MoveInLineOfSight(Unit* who) override { - if (!_introDone && me->IsAlive() && who->GetTypeId() == TYPEID_PLAYER && me->GetExactDist2dSq(who) <= 10000.0f) // 100*100, moveinlineofsight limited to 60yd anyway + if (!_introDone && me->IsAlive() && who->IsPlayer() && me->GetExactDist2dSq(who) <= 10000.0f) // 100*100, moveinlineofsight limited to 60yd anyway { Talk(SAY_ENTER_ZONE); _introDone = true; @@ -662,4 +662,3 @@ void AddSC_boss_lord_marrowgar() RegisterSpellScript(spell_marrowgar_bone_storm); RegisterSpellScript(spell_marrowgar_bone_slice); } - diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 1c9afabda..8753fefb4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -333,7 +333,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } @@ -1547,4 +1547,3 @@ void AddSC_boss_professor_putricide() RegisterSpellScript(spell_putricide_eat_ooze); RegisterSpellScript(spell_putricide_regurgitated_ooze); } - diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index f9ae6e1d9..b0b845e3d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -216,7 +216,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } @@ -913,4 +913,3 @@ void AddSC_boss_rotface() new npc_precious_icc(); } - diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 7f084643f..1295c9d1a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -361,7 +361,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } @@ -488,7 +488,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) if (uint32 spellId = sSpellMgr->GetSpellIdForDifficulty(70127, me)) if (spellId == spell->Id) if (Aura const* mysticBuffet = target->GetAura(spell->Id)) @@ -805,7 +805,7 @@ class spell_sindragosa_s_fury : public SpellScript { PreventHitDefaultEffect(effIndex); - if (!GetHitUnit()->IsAlive() || (GetHitUnit()->GetTypeId() == TYPEID_PLAYER && GetHitUnit()->ToPlayer()->IsGameMaster()) || !_targetCount) + if (!GetHitUnit()->IsAlive() || (GetHitUnit()->IsPlayer() && GetHitUnit()->ToPlayer()->IsGameMaster()) || !_targetCount) return; float resistance = float(GetHitUnit()->GetResistance(SpellSchoolMask(GetSpellInfo()->SchoolMask))); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 1a64dd1f6..6285b3500 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -725,7 +725,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && !me->IsInEvadeMode() && _phase != PHASE_OUTRO && _lastTalkTimeKill + 5 < GameTime::GetGameTime().count()) + if (victim->IsPlayer() && !me->IsInEvadeMode() && _phase != PHASE_OUTRO && _lastTalkTimeKill + 5 < GameTime::GetGameTime().count()) { _lastTalkTimeKill = GameTime::GetGameTime().count(); Talk(SAY_LK_KILL); @@ -2229,7 +2229,7 @@ public: me->CastSpell(me, SPELL_RAGING_SPIRIT_VISUAL, true); if (TempSummon* summon = me->ToTempSummon()) if (Unit* summoner = summon->GetSummonerUnit()) - if (summoner->GetTypeId() == TYPEID_PLAYER && summoner->IsAlive() && !summoner->ToPlayer()->IsBeingTeleported() && summoner->FindMap() == me->GetMap()) + if (summoner->IsPlayer() && summoner->IsAlive() && !summoner->ToPlayer()->IsBeingTeleported() && summoner->FindMap() == me->GetMap()) { valid = true; summoner->CastSpell(me, SPELL_RAGING_SPIRIT_VISUAL_CLONE, true); @@ -2290,7 +2290,7 @@ public: bool valid = false; if (TempSummon* summon = me->ToTempSummon()) if (Unit* summoner = summon->GetSummonerUnit()) - if (summoner->GetTypeId() == TYPEID_PLAYER && summoner->IsAlive() && !summoner->ToPlayer()->IsBeingTeleported() && summoner->FindMap() == me->GetMap()) + if (summoner->IsPlayer() && summoner->IsAlive() && !summoner->ToPlayer()->IsBeingTeleported() && summoner->FindMap() == me->GetMap()) { valid = true; AttackStart(summoner); @@ -2957,8 +2957,8 @@ public: { if (Unit* summoner = summ->GetSummonerUnit()) { - bool buff = _instance->GetBossState(DATA_THE_LICH_KING) == IN_PROGRESS && summoner->GetTypeId() == TYPEID_PLAYER && (!summoner->IsAlive() || summoner->ToPlayer()->IsBeingTeleported() || summoner->FindMap() != me->GetMap()); - if (summoner->GetTypeId() == TYPEID_PLAYER && !summoner->ToPlayer()->IsBeingTeleported() && summoner->FindMap() == me->GetMap()) + bool buff = _instance->GetBossState(DATA_THE_LICH_KING) == IN_PROGRESS && summoner->IsPlayer() && (!summoner->IsAlive() || summoner->ToPlayer()->IsBeingTeleported() || summoner->FindMap() != me->GetMap()); + if (summoner->IsPlayer() && !summoner->ToPlayer()->IsBeingTeleported() && summoner->FindMap() == me->GetMap()) { if (buff) summoner->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetGuidData(DATA_THE_LICH_KING)); @@ -2994,7 +2994,7 @@ public: if (TempSummon* summ = me->ToTempSummon()) if (Unit* summoner = summ->GetSummonerUnit()) { - if (summoner->IsAlive() && summoner->GetTypeId() == TYPEID_PLAYER) + if (summoner->IsAlive() && summoner->IsPlayer()) { summoner->CastSpell((Unit*)nullptr, SPELL_HARVEST_SOUL_VISUAL, true); summoner->ExitVehicle(summoner); @@ -3487,7 +3487,7 @@ public: bool CanAIAttack(Unit const* target) const override { - return me->GetReactState() == REACT_AGGRESSIVE && target->GetTypeId() == TYPEID_PLAYER && target->GetExactDistSq(495.708f, -2523.76f, 1049.95f) < 40.0f * 40.0f; + return me->GetReactState() == REACT_AGGRESSIVE && target->IsPlayer() && target->GetExactDistSq(495.708f, -2523.76f, 1049.95f) < 40.0f * 40.0f; } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 97485ee5b..fae3bb8b7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -551,7 +551,7 @@ public: void AttackStart(Unit* target) override { - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) BossAI::AttackStart(target); } @@ -564,7 +564,7 @@ public: bool CanAIAttack(Unit const* target) const override { - return target->GetTypeId() == TYPEID_PLAYER; + return target->IsPlayer(); } void JustReachedHome() override @@ -599,7 +599,7 @@ public: if (!threatList.empty()) for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) if (Unit* target = (*itr)->getTarget()) - if (target->IsAlive() && target->GetTypeId() == TYPEID_PLAYER && me->GetExactDist(target) < 200.0f && !target->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL)) + if (target->IsAlive() && target->IsPlayer() && me->GetExactDist(target) < 200.0f && !target->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL)) return; EnterEvadeMode(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index b94169666..86adf4725 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1211,7 +1211,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_CAPTAIN_KILL); } @@ -1237,7 +1237,7 @@ public: bool CanAIAttack(Unit const* target) const override { // do not see targets inside Frostwing Halls when we are not there - return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f) && (target->GetTypeId() == TYPEID_PLAYER || target->IsInCombat()); + return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f) && (target->IsPlayer() || target->IsInCombat()); } void EnterEvadeMode(EvadeReason why) override @@ -2713,7 +2713,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (me->IsAlive() && !me->IsInCombat() && who->GetTypeId() == TYPEID_PLAYER && who->GetExactDist2d(me) < 35.0f) + if (me->IsAlive() && !me->IsInCombat() && who->IsPlayer() && who->GetExactDist2d(me) < 35.0f) AttackStart(who); } @@ -3085,7 +3085,7 @@ public: ScriptedAI::MoveInLineOfSight(who); else { - if (!me->IsInCombat() && who->GetTypeId() == TYPEID_PLAYER && me->GetExactDist2dSq(who) < 25.0f * 25.0f && me->CanSeeOrDetect(who) && me->IsValidAttackTarget(who)) + if (!me->IsInCombat() && who->IsPlayer() && me->GetExactDist2dSq(who) < 25.0f * 25.0f && me->CanSeeOrDetect(who) && me->IsValidAttackTarget(who)) AttackStart(who); } } @@ -3230,7 +3230,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (!_didWebBeam && who->GetTypeId() == TYPEID_PLAYER && me->GetExactDist2d(who) < 70.0f) + if (!_didWebBeam && who->IsPlayer() && me->GetExactDist2d(who) < 70.0f) { _didWebBeam = true; float nx = me->GetPositionX(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index 109968294..775495598 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -134,4 +134,3 @@ void AddSC_icecrown_citadel_teleport() new icecrown_citadel_teleport(); new at_frozen_throne_teleport(); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index d42da7718..0845348e7 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -31,4 +31,3 @@ void AddSC_boss_four_horsemen() new boss_four_horsemen(); RegisterSpellScript(spell_four_horsemen_mark_aura); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 6af8a723a..b3a14c35d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -30,4 +30,3 @@ void AddSC_boss_gluth() new boss_gluth(); RegisterSpellScript(spell_gluth_decimate); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 6e0d2dd98..d195bd9ed 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -33,4 +33,3 @@ void AddSC_boss_gothik() new npc_gothik_trigger(); RegisterSpellScript(spell_gothik_shadow_bolt_volley); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 14c8b3a54..6e667d96a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -34,4 +34,3 @@ void AddSC_boss_grobbulus() RegisterSpellScript(spell_grobbulus_mutating_injection_aura); RegisterSpellScript(spell_grobbulus_poison); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 1a6c9e931..734da65e2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -32,4 +32,3 @@ void AddSC_boss_kelthuzad() RegisterSpellScript(spell_kelthuzad_frost_blast); RegisterSpellScript(spell_kelthuzad_detonate_mana_aura); } - diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 2f662e784..09989da49 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -30,4 +30,3 @@ void AddSC_boss_sapphiron() new boss_sapphiron(); RegisterSpellScript(spell_sapphiron_frost_explosion); } - diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 431e5ae55..79fd6c787 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -1240,4 +1240,3 @@ void AddSC_instance_naxxramas() new boss_naxxramas_misc(); new at_naxxramas_hub_portal(); } - diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 3162814de..68491abc5 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -894,7 +894,7 @@ public: void PassengerBoarded(Unit* pass, int8 /*seat*/, bool apply) override { - if (pass && !apply && pass->GetTypeId() == TYPEID_PLAYER) + if (pass && !apply && pass->IsPlayer()) { Player* plr = pass->ToPlayer(); float speed = plr->GetDistance(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()) / (1.0f * 0.001f); @@ -1258,7 +1258,7 @@ public: return; if (apply) { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { who->ApplySpellImmune(0, IMMUNITY_ID, SPELL_ARCANE_OVERLOAD_DMG, true); who->ApplySpellImmune(0, IMMUNITY_ID, SPELL_SURGE_OF_POWER_DMG, true); @@ -1286,7 +1286,7 @@ public: me->SetCanFly(false); me->GetMotionMaster()->MoveLand(0, me->GetPositionX(), me->GetPositionY(), 267.24f, 10.0f); - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { who->ApplySpellImmune(0, IMMUNITY_ID, SPELL_ARCANE_OVERLOAD_DMG, false); who->ApplySpellImmune(0, IMMUNITY_ID, SPELL_SURGE_OF_POWER_DMG, false); @@ -1456,7 +1456,7 @@ public: me->SetDisableGravity(false); me->SendMovementFlagUpdate(); } - else if (pass && pass->GetTypeId() == TYPEID_PLAYER && me->IsAlive()) + else if (pass && pass->IsPlayer() && me->IsAlive()) { me->SetDisplayId(11686); // prevents nasty falling animation at despawn me->DespawnOrUnsummon(1); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 8c6be93be..62b425431 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -251,4 +251,3 @@ void AddSC_instance_eye_of_eternity() { new instance_eye_of_eternity(); } - diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index e535e305b..1f34b91ec 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -222,4 +222,3 @@ void AddSC_boss_anomalus() new boss_anomalus(); new achievement_chaos_theory(); } - diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 34a69d479..5cdc46622 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -216,4 +216,3 @@ void AddSC_boss_keristrasza() new boss_keristrasza(); new achievement_intense_cold(); } - diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index eb3ac50bb..aa22aede4 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -273,4 +273,3 @@ void AddSC_instance_nexus() new instance_nexus(); new npc_crystalline_frayer(); } - diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 26e8f1d9e..0aa6de4f4 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -295,4 +295,3 @@ void AddSC_instance_oculus() { new instance_oculus(); } - diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index f869afa23..958af9464 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -922,4 +922,3 @@ void AddSC_oculus() RegisterSpellScript(spell_oculus_rider_aura); RegisterSpellScript(spell_oculus_drake_flag_aura); } - diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 005cc0e19..e41c57ace 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -290,4 +290,3 @@ void AddSC_boss_loken() new boss_loken(); new spell_loken_pulsing_shockwave(); } - diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 0f8403d9e..3de2a1263 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -475,7 +475,7 @@ public: { if (_attackGUID) ScriptedAI::MoveInLineOfSight(who); - else if (_isActive && who->GetTypeId() == TYPEID_PLAYER) + else if (_isActive && who->IsPlayer()) { if ((who->GetPositionX() < me->GetPositionX() || who->GetPositionY() < -220.0f) && me->GetDistance2d(who) < 40) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 33bfedcae..96b1e1a2a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -218,4 +218,3 @@ void AddSC_instance_halls_of_lightning() { new instance_halls_of_lightning(); } - diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 6027e9369..2e07f9a91 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -251,4 +251,3 @@ void AddSC_boss_krystallus() new spell_krystallus_shatter(); new spell_krystallus_shatter_effect(); } - diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp index 0ec7b52b4..b4ee33e66 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -899,4 +899,3 @@ void AddSC_brann_bronzebeard() new iron_golem_custodian(); new spell_hos_dark_matter(); } - diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 0f59da8f4..8449a7795 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -268,4 +268,3 @@ void AddSC_instance_halls_of_stone() { new instance_halls_of_stone(); } - diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 46a9dc8c3..471f6784d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -657,7 +657,7 @@ void boss_flame_leviathan::boss_flame_leviathanAI::KilledUnit(Unit* who) if (who == me->GetVictim()) events.RescheduleEvent(EVENT_PURSUE, 0ms); - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(FLAME_LEVIATHAN_SAY_SLAY); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 80694a911..92581c758 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -1313,4 +1313,3 @@ void AddSC_boss_freya() new achievement_freya_knock_on_wood("achievement_freya_knock_knock_on_wood", 2); new achievement_freya_knock_on_wood("achievement_freya_knock_knock_knock_on_wood", 3); } - diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 4c562f651..872d9340d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -203,7 +203,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - if (target && spell && target->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_VEZAX_SHADOW_CRASH_DMG) + if (target && spell && target->IsPlayer() && spell->Id == SPELL_VEZAX_SHADOW_CRASH_DMG) bAchievShadowdodger = false; } @@ -367,7 +367,7 @@ public: void KilledUnit(Unit* who) override { - if( who->GetTypeId() == TYPEID_PLAYER ) + if( who->IsPlayer() ) Talk(SAY_SLAY); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index a8eac4757..e526e3299 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -560,7 +560,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(TEXT_SLAY); } @@ -576,7 +576,7 @@ public: bool CanAIAttack(Unit const* t) const override { - if (t->GetTypeId() == TYPEID_PLAYER) + if (t->IsPlayer()) return !t->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER); else if (t->GetTypeId() == TYPEID_UNIT) return !t->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC); @@ -702,9 +702,9 @@ public: { if (Unit* s = me->ToTempSummon()->GetSummonerUnit()) { - if ((s->GetTypeId() == TYPEID_PLAYER && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER)) || (s->GetTypeId() == TYPEID_UNIT && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC))) + if ((s->IsPlayer() && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER)) || (s->GetTypeId() == TYPEID_UNIT && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC))) me->DespawnOrUnsummon(2000); - else if (s->GetTypeId() == TYPEID_PLAYER) + else if (s->IsPlayer()) if (InstanceScript* instanceScript = me->GetInstanceScript()) if (instanceScript->GetData(TYPE_HODIR) == NOT_STARTED) { @@ -1211,7 +1211,7 @@ class spell_hodir_biting_cold_main_aura : public AuraScript { if ((aurEff->GetTickNumber() % 4) == 0) if (Unit* target = GetTarget()) - if (target->GetTypeId() == TYPEID_PLAYER + if (target->IsPlayer() && !target->isMoving() && !target->HasAura(SPELL_BITING_COLD_PLAYER_AURA) && !target->HasAura(SPELL_MAGE_TOASTY_FIRE_AURA)) @@ -1357,7 +1357,7 @@ class spell_hodir_flash_freeze_aura : public AuraScript if (!target || !caster || caster->GetTypeId() != TYPEID_UNIT) return; - if (Aura* aur = target->GetAura(target->GetTypeId() == TYPEID_PLAYER ? SPELL_FLASH_FREEZE_TRAPPED_PLAYER : SPELL_FLASH_FREEZE_TRAPPED_NPC)) + if (Aura* aur = target->GetAura(target->IsPlayer() ? SPELL_FLASH_FREEZE_TRAPPED_PLAYER : SPELL_FLASH_FREEZE_TRAPPED_NPC)) { if (Unit* caster2 = aur->GetCaster()) { @@ -1369,7 +1369,7 @@ class spell_hodir_flash_freeze_aura : public AuraScript target->CastSpell(target, SPELL_FLASH_FREEZE_INSTAKILL, true); return; } - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { caster->ToCreature()->AI()->SetData(1, 1); if( Creature* c = target->SummonCreature(NPC_FLASH_FREEZE_PLR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 5 * 60 * 1000) ) @@ -1409,7 +1409,7 @@ class spell_hodir_storm_power_aura : public AuraScript void HandleAfterEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* target = GetTarget()) - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, GetId(), 0, GetCaster()); } @@ -1449,7 +1449,7 @@ class spell_hodir_toasty_fire_aura : public AuraScript void HandleAfterEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* target = GetTarget()) - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_MAGE_TOASTY_FIRE_AURA, 0, GetCaster()); } @@ -1466,7 +1466,7 @@ class spell_hodir_starlight_aura : public AuraScript void HandleAfterEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* target = GetTarget()) - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_DRUID_STARLIGHT_AREA_AURA, 0, GetCaster()); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 8c66fc036..7277c0257 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -290,7 +290,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_SLAY); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 34e213d04..f9210e80c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -174,7 +174,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER && me->GetExactDist2d(who) < 45.0f && me->getStandState() == UNIT_STAND_STATE_SUBMERGED) + if (who->IsPlayer() && me->GetExactDist2d(who) < 45.0f && me->getStandState() == UNIT_STAND_STATE_SUBMERGED) { me->SetStandState(UNIT_STAND_STATE_STAND); if (Unit* arm = ObjectAccessor::GetCreature(*me, _left)) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 90ada7fc1..a80545c36 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1186,7 +1186,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) if (Creature* c = GetMimiron()) { if (Phase == 1) @@ -1522,7 +1522,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) if (Creature* c = GetMimiron()) { if (Phase == 2) @@ -1827,7 +1827,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) if (Creature* c = GetMimiron()) { if (Phase == 3) @@ -1909,7 +1909,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - if (target && spell && target->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_MINE_EXPLOSION) + if (target && spell && target->IsPlayer() && spell->Id == SPELL_MINE_EXPLOSION) if (InstanceScript* pInstance = me->GetInstanceScript()) if (Creature* c = GetMimiron()) c->AI()->SetData(0, 11); @@ -2450,7 +2450,7 @@ public: { if (target->GetEntry() == NPC_ASSAULT_BOT) me->CastSpell(me, 65040, true); // achievement Not-So-Friendly Fire - else if (target->GetTypeId() == TYPEID_PLAYER) + else if (target->IsPlayer()) if (InstanceScript* pInstance = me->GetInstanceScript()) if (Creature* c = GetMimiron()) c->AI()->SetData(0, 13); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index c92f5db29..1baf2d1dd 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -1181,4 +1181,3 @@ void AddSC_boss_razorscale() new achievement_quick_shave(); new achievement_iron_dwarf_medium_rare(); } - diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index f9e6743a7..f516bfc84 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -510,7 +510,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_SLAY); } @@ -528,7 +528,7 @@ public: void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if (who && _isHitAllowed && who->GetPositionZ() > 430 && who->GetTypeId() == TYPEID_PLAYER) + if (who && _isHitAllowed && who->GetPositionZ() > 430 && who->IsPlayer()) { _isHitAllowed = false; DisableThorim(false); @@ -640,7 +640,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { - if (spellInfo->Id == SPELL_LIGHTNING_CHARGE_DAMAGE && target->GetTypeId() == TYPEID_PLAYER) + if (spellInfo->Id == SPELL_LIGHTNING_CHARGE_DAMAGE && target->IsPlayer()) _hitByLightning = true; } @@ -1111,7 +1111,7 @@ public: void DamageTaken(Unit* who, uint32&, DamageEffectType, SpellSchoolMask) override { - if (!_playerAttack && who && (who->GetTypeId() == TYPEID_PLAYER || who->GetOwnerGUID().IsPlayer())) + if (!_playerAttack && who && (who->IsPlayer() || who->GetOwnerGUID().IsPlayer())) { if (me->GetInstanceScript()) if (Creature* thorim = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetGuidData(TYPE_THORIM))) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 362256a0a..98e944888 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -225,7 +225,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && !urand(0, 2)) + if (victim->IsPlayer() && !urand(0, 2)) { Talk(SAY_SLAY); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index ed7f69221..df26adcb6 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -1097,7 +1097,7 @@ public: void OnUnitDeath(Unit* unit) override { // Feeds on Tears achievement - if (unit->GetTypeId() == TYPEID_PLAYER) + if (unit->IsPlayer()) { if (GetData(TYPE_ALGALON) == IN_PROGRESS) if (Creature* algalon = instance->GetCreature(m_uiAlgalonGUID)) @@ -1114,7 +1114,7 @@ public: } // achievement Champion/Conqueror of Ulduar - if (unit->GetTypeId() == TYPEID_PLAYER) + if (unit->IsPlayer()) for (uint8 i = 0; i <= 12; ++i) { bool go = false; @@ -1348,4 +1348,3 @@ void AddSC_instance_ulduar() { new instance_ulduar(); } - diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp index 90890f2f1..be980bd55 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -239,7 +239,7 @@ struct npc_ulduar_snow_mound : public ScriptedAI void MoveInLineOfSight(Unit* who) override { - if (!_activated && who->GetTypeId() == TYPEID_PLAYER) + if (!_activated && who->IsPlayer()) { if (me->GetExactDist2d(who) <= 10.0f && me->GetMap()->isInLineOfSight(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() + 5.0f, who->GetPositionX(), who->GetPositionY(), who->GetPositionZ() + 5.0f, 2, LINEOFSIGHT_ALL_CHECKS, VMAP::ModelIgnoreFlags::Nothing)) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 17b3add83..56582fdc5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -373,4 +373,3 @@ void AddSC_boss_keleseth() new npc_vrykul_skeleton(); RegisterSpellScript(spell_frost_tomb_aura); } - diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 6523b9dad..e7cdbee37 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -321,4 +321,3 @@ void AddSC_instance_utgarde_keep() { new instance_utgarde_keep(); } - diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 745909342..b85a73f23 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -239,4 +239,3 @@ void AddSC_utgarde_keep() RegisterSpellScript(spell_ticking_time_bomb_aura); } - diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 7e9d5db51..c196312e4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -821,4 +821,3 @@ void AddSC_boss_palehoof() new npc_frenzied_worgen(); new go_palehoof_sphere(); } - diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index d5639c6dd..221d462c2 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -533,4 +533,3 @@ void AddSC_boss_skadi() new boss_skadi_grauf(); new go_harpoon_canon(); } - diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 9e940ccf8..aa7d0e250 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -205,7 +205,7 @@ public: instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, 26555, 1, nullptr); } - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_SLAY); } @@ -439,4 +439,3 @@ void AddSC_boss_svala() new npc_ritual_channeler(); RegisterSpellAndAuraScriptPair(spell_svala_ritual_strike, spell_svala_ritual_strike_aura); } - diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 34b85bf36..4d9ac638c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -271,4 +271,3 @@ void AddSC_instance_utgarde_pinnacle() { new instance_utgarde_pinnacle(); } - diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp index 17473fcbb..f1640e844 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp @@ -72,4 +72,3 @@ void AddSC_utgarde_pinnacle() { RegisterSpellScript(spell_utgarde_pinnacle_beast_mark); } - diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index a706bdfc5..9ca2e4cd3 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -235,4 +235,3 @@ void AddSC_boss_archavon() new boss_archavon(); new spell_archavon_rock_shards(); } - diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 7ff02cc96..001b2dfb2 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -278,4 +278,3 @@ void AddSC_boss_emalon() new spell_voa_overcharge(); new spell_voa_lightning_nova(); } - diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 519861f82..8734d674f 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -263,4 +263,3 @@ void AddSC_boss_koralon() new spell_koralon_meteor_fists(); new spell_flame_warder_meteor_fists(); } - diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index 8cdb21947..782748d69 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -268,4 +268,3 @@ void AddSC_instance_vault_of_archavon() { new instance_vault_of_archavon(); } - diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 39353696d..231b1270d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -155,4 +155,3 @@ void AddSC_boss_moragg() new boss_moragg(); RegisterSpellScript(spell_optic_link_aura); } - diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 2a0594a4e..83f912605 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -677,4 +677,3 @@ void AddSC_instance_violet_hold() { new instance_violet_hold(); } - diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 18e1ce201..9555f7c81 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -376,7 +376,7 @@ class spell_ioc_gunship_portal : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleScript(SpellEffIndex effIndex) @@ -480,4 +480,3 @@ void AddSC_isle_of_conquest() RegisterSpellScript(spell_ioc_parachute_ic_aura); RegisterSpellScript(spell_ioc_launch); } - diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 9be383800..4355e2109 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -224,7 +224,7 @@ public: { if (Unit* owner = who->GetOwner()) { - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) { owner->CastSpell(owner, SPELL_MAMMOTH_CALF_ESCORT_CREDIT, true); who->ToCreature()->DespawnOrUnsummon(); @@ -746,7 +746,7 @@ public: void SpellHit(Unit* unit, SpellInfo const* spell) override { - if (spell->Id == SPELL_NEURAL_NEEDLE && unit->GetTypeId() == TYPEID_PLAYER) + if (spell->Id == SPELL_NEURAL_NEEDLE && unit->IsPlayer()) { if (Player* player = unit->ToPlayer()) { @@ -2060,4 +2060,3 @@ void AddSC_borean_tundra() RegisterSpellScript(spell_q11719_bloodspore_ruination_45997); new npc_bloodmage_laurith(); } - diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index db8e98df7..9d0a4f893 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -917,7 +917,7 @@ public: void DamageTaken(Unit* who, uint32&, DamageEffectType, SpellSchoolMask) override { - if (who && who->GetTypeId() == TYPEID_PLAYER) + if (who && who->IsPlayer()) { me->SetLootRecipient(who); me->LowerPlayerDamageReq(me->GetMaxHealth()); @@ -1567,7 +1567,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) Talk(2); } diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index f39284d2c..06974fad7 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -797,7 +797,7 @@ public: void SpellHit(Unit* caster, SpellInfo const* spell) override { - if (spell->Id == SPELL_SMOKE_BOMB && caster->GetTypeId() == TYPEID_PLAYER) + if (spell->Id == SPELL_SMOKE_BOMB && caster->IsPlayer()) { me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToPC(true); @@ -1000,7 +1000,7 @@ class spell_infected_worgen_bite_aura : public AuraScript void HandleAfterEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) if (GetStackAmount() == GetSpellInfo()->StackAmount) { SetDuration(0); @@ -1283,4 +1283,3 @@ void AddSC_grizzly_hills() RegisterSpellScript(spell_q12227_camera_shake); RegisterSpellScript(spell_frog_kiss); } - diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 5c258276e..79cfb26da 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -303,7 +303,7 @@ public: ObjectGuid summonerGUID; if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit()) - if (summoner->GetTypeId() == TYPEID_PLAYER) + if (summoner->IsPlayer()) summonerGUID = summoner->GetGUID(); if (!summonerGUID) diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 1e973f179..684b6a58b 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -2156,4 +2156,3 @@ void AddSC_icecrown() new npc_blessed_banner(); new npc_frostbrood_skytalon(); } - diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 265041205..8e49b983e 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -1342,7 +1342,7 @@ public: void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) override { - if (apply && passenger->GetTypeId() == TYPEID_PLAYER) + if (apply && passenger->IsPlayer()) { Movement::PointsArray pathPoints; pathPoints.push_back(G3D::Vector3(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ())); @@ -1401,7 +1401,7 @@ public: if (spell->Id == SPELL_LAND) { Unit* passenger = me->GetVehicleKit()->GetPassenger(1); // player should be on seat 1 - if (passenger && passenger->GetTypeId() == TYPEID_PLAYER) + if (passenger && passenger->IsPlayer()) passenger->CastSpell(passenger, SPELL_CREDIT, true); me->DespawnOrUnsummon(); @@ -1511,4 +1511,3 @@ void AddSC_sholazar_basin() RegisterSpellScript(spell_q12611_deathbolt); } - diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 802f65eb3..8ab42c3f9 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -49,7 +49,7 @@ public: void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { if (apply) { @@ -869,7 +869,7 @@ public: case EVENT_REACHED_HOME: if (Vehicle* vehicle = me->GetVehicleKit()) if (Unit* player = vehicle->GetPassenger(0)) - if (player->GetTypeId() == TYPEID_PLAYER) + if (player->IsPlayer()) { // for each prisoner on drake, give credit for (uint8 i = 1; i < 4; ++i) @@ -910,7 +910,7 @@ public: void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { if (apply) Start(false, true, who->GetGUID()); @@ -1116,7 +1116,7 @@ public: { if (Unit* player = vehicle->GetPassenger(0)) { - if (player->GetTypeId() == TYPEID_PLAYER) + if (player->IsPlayer()) { player->m_Events.AddEventAtOffset([player]() { @@ -1136,7 +1136,7 @@ public: { if (Unit* player = vehicle->GetPassenger(0)) { - if (player->GetTypeId() == TYPEID_PLAYER) + if (player->IsPlayer()) { player->m_Events.AddEventAtOffset([player]() { @@ -1187,4 +1187,3 @@ void AddSC_storm_peaks() new npc_vehicle_d16_propelled_delivery(); RegisterSpellScript(spell_q12823_remove_collapsing_cave_aura); } - diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 1b4af9044..9114f4b6b 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -413,7 +413,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { if (playerGUID) { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 34a66aa37..1e1933d19 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -775,4 +775,3 @@ void AddSC_outdoorpvp_ep() { new OutdoorPvP_eastern_plaguelands(); } - diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp index fcd214106..e60a89a0b 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp @@ -130,4 +130,3 @@ void AddSC_outdoorpvp_gh() { new OutdoorPvP_grizzly_hills(); } - diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index e1c0cb247..403fafd97 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -369,4 +369,3 @@ void AddSC_outdoorpvp_hp() { new OutdoorPvP_hellfire_peninsula(); } - diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index dfa807ce7..f8b8664d7 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -74,7 +74,7 @@ void OutdoorPvPNA::HandleKill(Player* killer, Unit* killed) void OutdoorPvPNA::HandleKillImpl(Player* player, Unit* killed) { - if (killed->GetTypeId() == TYPEID_PLAYER && player->GetTeamId() != killed->ToPlayer()->GetTeamId()) + if (killed->IsPlayer() && player->GetTeamId() != killed->ToPlayer()->GetTeamId()) { player->KilledMonsterCredit(NA_CREDIT_MARKER); player->CastSpell(player, player->GetTeamId() == TEAM_ALLIANCE ? NA_KILL_TOKEN_ALLIANCE : NA_KILL_TOKEN_HORDE, true); @@ -928,4 +928,3 @@ void AddSC_outdoorpvp_na() new OutdoorPvP_nagrand(); RegisterCreatureAI(outdoorpvp_na_halaa_creatures); } - diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 11bc49a34..357f810ea 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -264,4 +264,3 @@ void AddSC_outdoorpvp_si() { new OutdoorPvP_silithus(); } - diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index b41be0b63..075ef17d8 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -486,4 +486,3 @@ void AddSC_outdoorpvp_tf() { new OutdoorPvP_terokkar_forest(); } - diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 6387e3d6f..ab0325b9b 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -470,4 +470,3 @@ void AddSC_outdoorpvp_zm() { new OutdoorPvP_zangarmarsh(); } - diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 8e29442a2..072df72a2 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -83,7 +83,7 @@ struct boss_exarch_maladaar : public BossAI void MoveInLineOfSight(Unit* who) override { - if (!_talked && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 150.0f)) + if (!_talked && who->IsPlayer() && me->IsWithinDistInMap(who, 150.0f)) { _talked = true; Talk(SAY_INTRO); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 9cf5638f0..484ea87ab 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -240,4 +240,3 @@ void AddSC_boss_shirrak_the_dead_watcher() RegisterAuchenaiCryptsCreatureAI(boss_shirrak_the_dead_watcher); RegisterSpellScript(spell_auchenai_possess); } - diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 07f5762e5..7066d91b9 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -77,7 +77,7 @@ struct boss_nexusprince_shaffar : public BossAI void MoveInLineOfSight(Unit* who) override { - if (!HasTaunted && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) + if (!HasTaunted && who->IsPlayer() && me->IsWithinDistInMap(who, 100.0f)) { HasTaunted = true; Talk(SAY_INTRO); @@ -133,7 +133,7 @@ struct boss_nexusprince_shaffar : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_SLAY); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index e859d4d76..76ec3b329 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -101,7 +101,7 @@ struct boss_pandemonius : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_KILL); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 46f00e2c1..1b249d31b 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -97,7 +97,7 @@ struct boss_darkweaver_syth : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_SLAY); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp index 7a8962da9..45ab78390 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp @@ -180,4 +180,3 @@ void AddSC_boss_talon_king_ikiss() RegisterSethekkHallsCreatureAI(boss_talon_king_ikiss); RegisterSpellScript(spell_talon_king_ikiss_blink); } - diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 7159dc870..4d6f959ce 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -31,6 +31,14 @@ ObjectData const gameObjectData[] = { 0, 0 } }; +ObjectData const creatureData[] = +{ + { NPC_VOICE_OF_THE_RAVEN_GOD, DATA_VOICE_OF_THE_RAVEN_GOD }, + { 0, 0 } +}; + +const uint32 anzuSummonEventId = 14797; + class instance_sethekk_halls : public InstanceMapScript { public: @@ -48,14 +56,14 @@ public: SetHeaders(DataHeaders); SetBossNumber(EncounterCount); LoadDoorData(doorData); - LoadObjectData(nullptr, gameObjectData); + LoadObjectData(creatureData, gameObjectData); } - void OnCreatureCreate(Creature* creature) override + void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) override { - if (creature->GetEntry() == NPC_ANZU || creature->GetEntry() == NPC_VOICE_OF_THE_RAVEN_GOD) - if (GetBossState(DATA_ANZU) == DONE) - creature->DespawnOrUnsummon(1); + if (eventId == anzuSummonEventId) + if (!GetCreature(DATA_VOICE_OF_THE_RAVEN_GOD) && GetBossState(DATA_ANZU) != DONE) + instance->SummonCreature(NPC_VOICE_OF_THE_RAVEN_GOD, Position(-88.02f, 288.18f, 75.2f, 6.0f)); } }; }; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h index 69bf90cb8..2d559bacf 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h @@ -41,7 +41,8 @@ enum eTypes enum InstanceData { - DATA_GO_TALON_KING_COFFER + DATA_GO_TALON_KING_COFFER, + DATA_VOICE_OF_THE_RAVEN_GOD }; enum eIds diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index fc59e7c3d..1717a518d 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -186,7 +186,7 @@ struct boss_grandmaster_vorpil : public BossAI void MoveInLineOfSight(Unit* who) override { ScriptedAI::MoveInLineOfSight(who); - if (!sayIntro && who->GetTypeId() == TYPEID_PLAYER) + if (!sayIntro && who->IsPlayer()) { Talk(SAY_INTRO); sayIntro = true; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 91efd32be..3c20ff921 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -259,4 +259,3 @@ void AddSC_boss_murmur() RegisterSpellScript(spell_shockwave_knockback); RegisterSpellScript(spell_murmur_sonic_boom_effect); } - diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 1f1a99d59..96218c914 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -138,4 +138,3 @@ void AddSC_instance_shadow_labyrinth() new instance_shadow_labyrinth(); RegisterSpellScript(spell_mark_of_malice); } - diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 1726beedd..97c2a096d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -235,4 +235,3 @@ void AddSC_boss_gurtogg_bloodboil() RegisterSpellScript(spell_gurtogg_bloodboil); RegisterSpellScript(spell_gurtogg_eject); } - diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 4c26f09ab..70e1c3fa0 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1378,4 +1378,3 @@ void AddSC_boss_illidan() RegisterSpellScript(spell_illidan_cage_trap); RegisterSpellScript(spell_illidan_cage_trap_stun_aura); } - diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 634699d89..db41a2091 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -208,8 +208,6 @@ class spell_mother_shahraz_fatal_attraction : public SpellScript void FilterTargets(std::list& targets) { targets.remove_if(Acore::UnitAuraCheck(true, SPELL_SABER_LASH_IMMUNITY)); - if (targets.size() <= 1) - FinishCast(SPELL_FAILED_DONT_REPORT); } void SetDest(SpellDestination& dest) @@ -249,12 +247,17 @@ class spell_mother_shahraz_fatal_attraction_dummy : public SpellScript void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit* target = GetHitUnit()) - { - target->CastSpell(target, SPELL_FATAL_ATTRACTION_DAMAGE, true); - if (AuraEffect* aurEff = target->GetAuraEffect(SPELL_FATAL_ATTRACTION_AURA, EFFECT_1)) - aurEff->SetAmount(aurEff->GetTickNumber()); - } + if (Unit* caster = GetCaster()) + if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_FATAL_ATTRACTION_AURA, EFFECT_1)) + { + if (aurEff->GetTickNumber() <= 2) + { + int32 damage = 1000 * aurEff->GetTickNumber(); + caster->CastCustomSpell(caster, SPELL_FATAL_ATTRACTION_DAMAGE, &damage, 0, 0, true); + } + else + caster->CastSpell(caster, SPELL_FATAL_ATTRACTION_DAMAGE, true); + } } void Register() override @@ -263,25 +266,6 @@ class spell_mother_shahraz_fatal_attraction_dummy : public SpellScript } }; -class spell_mother_shahraz_fatal_attraction_aura : public AuraScript -{ - PrepareAuraScript(spell_mother_shahraz_fatal_attraction_aura); - - void Update(AuraEffect const* effect) - { - if (effect->GetTickNumber() > uint32(effect->GetAmount() + 1)) - { - PreventDefaultAction(); - SetDuration(0); - } - } - - void Register() override - { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_fatal_attraction_aura::Update, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - } -}; - void AddSC_boss_mother_shahraz() { RegisterBlackTempleCreatureAI(boss_mother_shahraz); @@ -290,6 +274,4 @@ void AddSC_boss_mother_shahraz() RegisterSpellScript(spell_mother_shahraz_saber_lash_aura); RegisterSpellScript(spell_mother_shahraz_fatal_attraction); RegisterSpellScript(spell_mother_shahraz_fatal_attraction_dummy); - RegisterSpellScript(spell_mother_shahraz_fatal_attraction_aura); } - diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 36cd73151..50b6f7359 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -730,4 +730,3 @@ void AddSC_boss_reliquary_of_souls() RegisterSpellScript(spell_reliquary_of_souls_aura_of_anger_aura); RegisterSpellScript(spell_reliquary_of_souls_spite_aura); } - diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index da4f9f9f0..9852bc345 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -538,4 +538,3 @@ void AddSC_boss_shade_of_akama() RegisterSpellScript(spell_shade_of_akama_shade_soul_channel); RegisterSpellScript(spell_shade_of_akama_akama_soul_expel); } - diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index dca4b7e26..91ee4a3ae 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -332,4 +332,3 @@ void AddSC_boss_teron_gorefiend() RegisterSpellScript(spell_teron_gorefiend_shadowy_construct); RegisterSpellScript(spell_teron_gorefiend_shadow_of_death_remove); } - diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 90c2538f5..e0098c694 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -99,7 +99,7 @@ struct boss_najentus : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && _canTalk) + if (victim->IsPlayer() && _canTalk) { Talk(SAY_SLAY); _canTalk = false; @@ -162,4 +162,3 @@ void AddSC_boss_najentus() RegisterSpellScript(spell_najentus_needle_spine); RegisterSpellScript(spell_najentus_hurl_spine); } - diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index f77b4d639..39417fd2c 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -270,7 +270,12 @@ public: struct boss_gathios_the_shattererAI : public boss_illidari_council_memberAI { - boss_gathios_the_shattererAI(Creature* creature) : boss_illidari_council_memberAI(creature) { } + boss_gathios_the_shattererAI(Creature* creature) : boss_illidari_council_memberAI(creature) + { + _toggleBlessing = RAND(true, false); + _toggleAura = RAND(true, false); + _toggleSeal = RAND(true, false); + } Creature* SelectCouncilMember() { @@ -309,11 +314,15 @@ public: { case EVENT_SPELL_BLESSING: if (Unit* member = SelectCouncilMember()) - me->CastSpell(member, RAND(SPELL_BLESSING_OF_SPELL_WARDING, SPELL_BLESSING_OF_PROTECTION), false); + { + me->CastSpell(member, _toggleBlessing ? SPELL_BLESSING_OF_PROTECTION : SPELL_BLESSING_OF_SPELL_WARDING); + _toggleBlessing = !_toggleBlessing; + } events.ScheduleEvent(EVENT_SPELL_BLESSING, 15000); break; case EVENT_SPELL_AURA: - me->CastSpell(me, RAND(SPELL_DEVOTION_AURA, SPELL_CHROMATIC_RESISTANCE_AURA), false); + me->CastSpell(me, _toggleAura ? SPELL_DEVOTION_AURA : SPELL_CHROMATIC_RESISTANCE_AURA); + _toggleAura = !_toggleAura; events.ScheduleEvent(EVENT_SPELL_AURA, 60000); break; case EVENT_SPELL_CONSECRATION: @@ -333,7 +342,8 @@ public: events.ScheduleEvent(EVENT_SPELL_HAMMER_OF_JUSTICE, 0); break; case EVENT_SPELL_SEAL: - me->CastSpell(me, RAND(SPELL_SEAL_OF_COMMAND, SPELL_SEAL_OF_BLOOD), false); + me->CastSpell(me, _toggleSeal ? SPELL_SEAL_OF_COMMAND : SPELL_SEAL_OF_BLOOD); + _toggleSeal = !_toggleSeal; events.ScheduleEvent(EVENT_SPELL_SEAL, 20000); break; case EVENT_SPELL_JUDGEMENT: @@ -344,6 +354,10 @@ public: DoMeleeAttackIfReady(); } + private: + bool _toggleBlessing; + bool _toggleAura; + bool _toggleSeal; }; }; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 2e0f7db89..f324168f4 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -486,6 +486,22 @@ class spell_black_temple_summon_shadowfiends : public SpellScript } }; +class spell_black_temple_l5_arcane_charge : public SpellScript +{ + PrepareSpellScript(spell_black_temple_l5_arcane_charge) + + void RecalculateDamage() + { + uint32 damage = GetHitUnit()->SpellDamageBonusTaken(GetCaster(), GetSpellInfo(), GetHitUnit()->CountPctFromMaxHealth(100), SPELL_DIRECT_DAMAGE); + SetHitDamage(int32(damage)); + } + + void Register() override + { + OnHit += SpellHitFn(spell_black_temple_l5_arcane_charge::RecalculateDamage); + } +}; + void AddSC_instance_black_temple() { new instance_black_temple(); @@ -502,5 +518,5 @@ void AddSC_instance_black_temple() RegisterSpellScript(spell_black_temple_curse_of_vitality_aura); RegisterSpellScript(spell_black_temple_dementia_aura); RegisterSpellScript(spell_black_temple_summon_shadowfiends); + RegisterSpellScript(spell_black_temple_l5_arcane_charge); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index f3c966b33..c557b59d0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -621,4 +621,3 @@ void AddSC_boss_fathomlord_karathress() RegisterSpellScript(spell_karathress_power_of_tidalvess); RegisterSpellScript(spell_karathress_power_of_caribdis); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index ca70ae838..060c627ee 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -360,4 +360,3 @@ void AddSC_boss_hydross_the_unstable() RegisterSpellScript(spell_hydross_cleansing_field_command); RegisterSpellScript(spell_hydross_mark_of_hydross); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index b1521fe2f..7207b2841 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -170,7 +170,7 @@ struct boss_lady_vashj : public BossAI void MoveInLineOfSight(Unit* who) override { - if (!_intro && who->GetTypeId() == TYPEID_PLAYER) + if (!_intro && who->IsPlayer()) { _intro = true; Talk(SAY_INTRO); @@ -462,4 +462,3 @@ void AddSC_boss_lady_vashj() RegisterSpellScript(spell_lady_vashj_spore_drop_effect); RegisterSpellScript(spell_lady_vashj_summons); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index c632d961c..aef75b359 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -460,4 +460,3 @@ void AddSC_boss_leotheras_the_blind() RegisterSpellScript(spell_leotheras_demon_link); RegisterSpellScript(spell_leotheras_clear_consuming_madness); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 2494acf59..d07b78070 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -222,4 +222,3 @@ void AddSC_boss_morogrim_tidewalker() RegisterSpellScript(spell_morogrim_tidewalker_watery_grave); RegisterSpellScript(spell_morogrim_tidewalker_water_globule_new_target); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 59ca24665..5df41e6fa 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -378,4 +378,3 @@ void AddSC_instance_serpentshrine_cavern() RegisterSerpentShrineAI(npc_rancid_mushroom); RegisterSpellScript(spell_rancid_spore_cloud); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp index eea265327..741a8e78f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp @@ -43,4 +43,3 @@ void AddSC_the_slave_pens() { new at_quagmirran_lair(); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 3330f26ea..2526702ea 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -62,7 +62,7 @@ struct boss_warlord_kalithresh : public BossAI void MoveInLineOfSight(Unit* who) override { - if (!_introDone && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 35.0f)) + if (!_introDone && who->IsPlayer() && me->IsWithinDistInMap(who, 35.0f)) { Talk(SAY_INTRO); _introDone = true; @@ -172,4 +172,3 @@ void AddSC_boss_warlord_kalithresh() RegisterSteamvaultCreatureAI(boss_warlord_kalithresh); RegisterSpellScript(spell_warlords_rage); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index e66968bf1..6c106d7e2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -188,4 +188,3 @@ void AddSC_instance_steam_vault() new go_main_chambers_access_panel(); new instance_steam_vault(); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp index ea086048b..0510e6b91 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp @@ -159,4 +159,3 @@ void AddSC_boss_ghazan() RegisterUnderbogCreatureAI(boss_ghazan); new at_underbog_ghazan(); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 21b48dc35..73beb4eb0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -189,4 +189,3 @@ void AddSC_boss_hungarfen() RegisterSpellScript(spell_spore_cloud); RegisterSpellScript(spell_despawn_underbog_mushrooms); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index f102a99f8..e81ddd3c0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -217,4 +217,3 @@ void AddSC_boss_the_black_stalker() RegisterSpellScript(spell_the_black_stalker_someone_grab_me); RegisterSpellScript(spell_the_black_stalker_magnetic_pull); } - diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/underbog.cpp index b467076ce..5332e3dfe 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/underbog.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/underbog.cpp @@ -123,4 +123,3 @@ void AddSC_underbog() RegisterSpellScript(spell_fungal_decay); RegisterSpellScript(spell_allergies); } - diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 8a0357ab0..ea5e3c19f 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -315,4 +315,3 @@ void AddSC_boss_gruul() RegisterSpellScript(spell_gruul_shatter); RegisterSpellScript(spell_gruul_shatter_effect); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 67d2c0da9..8494992f7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -71,7 +71,7 @@ struct boss_the_maker : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && urand(0, 1)) + if (victim->IsPlayer() && urand(0, 1)) { Talk(SAY_KILL); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index ec612ddfd..26a0c780b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -365,4 +365,3 @@ void AddSC_boss_vazruden_the_herald() RegisterSpellScript(spell_vazruden_fireball); RegisterSpellScript(spell_vazruden_call_nazan); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 26728de35..a81cd8944 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -100,7 +100,7 @@ struct boss_watchkeeper_gargolmar : public BossAI { if (!_taunted) { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { _taunted = true; Talk(SAY_TAUNT); @@ -171,4 +171,3 @@ void AddSC_boss_watchkeeper_gargolmar() RegisterHellfireRampartsCreatureAI(boss_watchkeeper_gargolmar); RegisterSpellScript(spell_gargolmar_retalliation); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_porung.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_porung.cpp index 6db279c30..77982ad4e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_porung.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_porung.cpp @@ -317,4 +317,3 @@ void AddSC_boss_porung() RegisterShatteredHallsCreatureAI(npc_shattered_hand_scout); RegisterSpellScript(spell_tsh_shoot_flame_arrow); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index af9c20bca..638570c64 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -226,7 +226,7 @@ struct boss_warbringer_omrogg : public BossAI void KilledUnit(Unit* victim) override { - if (victim && victim->GetTypeId() == TYPEID_PLAYER) + if (victim && victim->IsPlayer()) HandleHeadTalk(SAY_ON_KILL); } @@ -288,4 +288,3 @@ void AddSC_boss_warbringer_omrogg() RegisterShatteredHallsCreatureAI(boss_warbringer_omrogg); RegisterSpellScript(spell_burning_maul); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 55979fb1c..a190b744b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -157,7 +157,7 @@ struct boss_warchief_kargath_bladefist : public BossAI void KilledUnit(Unit* victim) override { - if (victim && victim->GetTypeId() == TYPEID_PLAYER) + if (victim && victim->IsPlayer()) Talk(SAY_SLAY); } @@ -322,4 +322,3 @@ void AddSC_boss_warchief_kargath_bladefist() RegisterShatteredHallsCreatureAI(npc_warchief_portal); RegisterSpellScript(spell_blade_dance_targeting); } - diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 53df0a4e4..3e739e6a4 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -207,4 +207,3 @@ void AddSC_instance_shattered_halls() new instance_shattered_halls(); new at_shattered_halls_execution(); } - diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index f028ac61f..5195c8bbe 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -536,4 +536,3 @@ void AddSC_boss_alar() RegisterSpellScript(spell_alar_ember_blast); RegisterSpellScript(spell_alar_dive_bomb); } - diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index dc1b9a02c..309fd555f 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -108,7 +108,7 @@ struct boss_high_astromancer_solarian : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50)) + if (victim->IsPlayer() && roll_chance_i(50)) { Talk(SAY_KILL); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 303e091af..8ff0f0512 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -315,7 +315,7 @@ struct boss_kaelthas : public BossAI void MoveInLineOfSight(Unit* who) override { - if (_phase == PHASE_NONE && who->GetTypeId() == TYPEID_PLAYER && me->IsValidAttackTarget(who)) + if (_phase == PHASE_NONE && who->IsPlayer() && me->IsValidAttackTarget(who)) { _phase = PHASE_SINGLE_ADVISOR; me->SetInCombatWithZone(); @@ -345,7 +345,7 @@ struct boss_kaelthas : public BossAI void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) Talk(SAY_SLAY); } @@ -1270,7 +1270,7 @@ class spell_kaelthas_nether_beam : public SpellScript for (ThreatContainer::StorageType::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) { Unit* target = ObjectAccessor::GetUnit(*GetCaster(), (*itr)->getUnitGuid()); - if (target && target->GetTypeId() == TYPEID_PLAYER) + if (target && target->IsPlayer()) targetList.push_back(target); } @@ -1340,4 +1340,3 @@ void AddSC_boss_kaelthas() RegisterSpellScript(spell_kaelthas_summon_nether_vapor); RegisterSpellScript(spell_kael_pyroblast); } - diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 354e45c41..7bd5755e8 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -168,4 +168,3 @@ void AddSC_instance_the_eye() new instance_the_eye(); RegisterSpellScript(spell_the_eye_countercharge_aura); } - diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index c12f9f5cb..89f78db76 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -223,4 +223,3 @@ void AddSC_boss_mechano_lord_capacitus() RegisterSpellScript(spell_capacitus_polarity_charge_aura); RegisterSpellScript(spell_capacitus_polarity_shift); } - diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 99a367c1c..c45fe391f 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -217,4 +217,3 @@ void AddSC_boss_nethermancer_sepethrea() RegisterMechanarCreatureAI(npc_raging_flames); RegisterSpellScript(spell_ragin_flames_inferno); } - diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index f9f5dad49..1aa95aa7d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -622,4 +622,3 @@ void AddSC_arcatraz() RegisterSpellScript(spell_arcatraz_soul_steal_aura); } - diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index e4ff14b1b..0137990ae 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -83,4 +83,3 @@ void AddSC_boss_zereketh_the_unbound() { RegisterArcatrazCreatureAI(boss_zereketh_the_unbound); } - diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index a11278339..6c2e41b08 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -162,4 +162,3 @@ void AddSC_boss_commander_sarannis() RegisterSpellScript(spell_commander_sarannis_arcane_devastation); RegisterSpellScript(spell_commander_sarannis_summon_reinforcements); } - diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index 082a918e9..854d5b2f0 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -153,4 +153,3 @@ void AddSC_instance_the_botanica() RegisterSpellScript(spell_botanica_call_of_the_falcon_aura); RegisterSpellScript(spell_botanica_shift_form_aura); } - diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index b7715016a..5129a51e7 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -116,7 +116,7 @@ public: void KilledUnit(Unit* victim) override { - if (victim->GetTypeId() == TYPEID_PLAYER) + if (victim->IsPlayer()) { Talk(SAY_KILL); DoCastSelf(SPELL_CAPTURE_SOUL); @@ -189,4 +189,3 @@ void AddSC_boss_doomlordkazzak() new boss_doomlord_kazzak(); RegisterSpellScript(spell_mark_of_kazzak_aura); } - diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index fe3351f75..774dcfe58 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -105,7 +105,7 @@ struct boss_doomwalker : public ScriptedAI void MoveInLineOfSight(Unit* who) override { - if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsValidAttackTarget(who)) + if (who && who->IsPlayer() && me->IsValidAttackTarget(who)) { if (who->HasAura(SPELL_MARK_DEATH) && !who->HasAura(27827)) // Spirit of Redemption { diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 9f549e2b7..638c2bbce 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -332,7 +332,7 @@ public: void SpellHit(Unit* caster, SpellInfo const* spell) override { - if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER) + if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->IsPlayer()) { const uint32 entry_list[4] = {ENTRY_PROTO, ENTRY_ADOLE, ENTRY_MATUR, ENTRY_NIHIL}; int cid = rand() % (4 - 1); @@ -466,7 +466,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { if (who->HasAura(SPELL_LASHHAN_CHANNEL) && me->IsWithinDistInMap(who, 10.0f)) { diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index a52f2089d..717232742 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -170,7 +170,7 @@ public: { npc_ancestral_wolfAI(Creature* creature) : npc_escortAI(creature) { - if (creature->GetOwner() && creature->GetOwner()->GetTypeId() == TYPEID_PLAYER) + if (creature->GetOwner() && creature->GetOwner()->IsPlayer()) Start(false, false, creature->GetOwner()->GetGUID()); creature->SetSpeed(MOVE_WALK, 1.5f); DoCast(SPELL_GUIDED_BY_THE_SPIRITS); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index c7d83bc7a..a28def11d 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -489,4 +489,3 @@ void AddSC_nagrand() new npc_kurenai_captive(); new go_warmaul_prison(); } - diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 61bf6c91c..9d58107ef 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -869,4 +869,3 @@ void AddSC_netherstorm() RegisterSpellAndAuraScriptPair(spell_q10190_battery_recharging_blaster, spell_q10190_battery_recharging_blaster_aura); RegisterSpellScript(spell_challenge_veraku); } - diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 7fdf0c55a..1cf8e89f7 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -323,7 +323,7 @@ public: if (bCanEat || bIsEating) return; - if (pCaster->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_PLACE_CARCASS && !me->HasAura(SPELL_JUST_EATEN)) + if (pCaster->IsPlayer() && spell->Id == SPELL_PLACE_CARCASS && !me->HasAura(SPELL_JUST_EATEN)) { uiPlayerGUID = pCaster->GetGUID(); bCanEat = true; @@ -599,7 +599,7 @@ public: PlayerGUID = caster->GetGUID(); - if (caster->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_POISON && !Tapped) + if (caster->IsPlayer() && spell->Id == SPELL_POISON && !Tapped) { Tapped = true; caster->GetClosePoint(x, y, z, me->GetObjectSize()); @@ -1278,7 +1278,7 @@ public: { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) { DoCast(target, SpawnCast[1].SpellId); //Focused Bursts SpellTimer1 = SpawnCast[1].Timer2 + (rand() % 5 * 1000); diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index e95c5c109..959649e0f 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -103,7 +103,7 @@ public: void MySelectNextTarget() { Unit* owner = me->GetOwner(); - if (owner && owner->GetTypeId() == TYPEID_PLAYER && (!me->GetVictim() || me->GetVictim()->IsImmunedToSpell(sSpellMgr->GetSpellInfo(51963)) || !me->IsValidAttackTarget(me->GetVictim()) || !owner->CanSeeOrDetect(me->GetVictim()))) + if (owner && owner->IsPlayer() && (!me->GetVictim() || me->GetVictim()->IsImmunedToSpell(sSpellMgr->GetSpellInfo(51963)) || !me->IsValidAttackTarget(me->GetVictim()) || !owner->CanSeeOrDetect(me->GetVictim()))) { Unit* selection = owner->ToPlayer()->GetSelectedUnit(); if (selection && selection != me->GetVictim() && me->IsValidAttackTarget(selection)) @@ -375,4 +375,3 @@ void AddSC_deathknight_pet_scripts() new npc_pet_dk_dancing_rune_weapon(); RegisterSpellScript(spell_pet_dk_gargoyle_strike); } - diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 2138aa0c5..539b29bc1 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -528,7 +528,7 @@ struct npc_pet_gen_imp_in_a_bottle : public NullCreatureAI if (TempSummon* summon = me->ToTempSummon()) if (Unit* owner = summon->GetSummonerUnit()) - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) { _ownerGUID = owner->GetGUID(); if (owner->ToPlayer()->GetGroup()) @@ -837,4 +837,3 @@ void AddSC_generic_pet_scripts() RegisterCreatureAI(npc_pet_gen_moth); RegisterCreatureAI(npc_pet_darting_hatchling); } - diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 2bb4f209c..d498af4d9 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -158,7 +158,7 @@ struct npc_pet_mage_mirror_image : CasterAI _ebonGargoyleGUID.Clear(); } Unit* owner = me->GetOwner(); - if (owner && owner->GetTypeId() == TYPEID_PLAYER) + if (owner && owner->IsPlayer()) { Unit* selection = owner->ToPlayer()->GetSelectedUnit(); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index b8f95822c..4134a6931 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -360,14 +360,14 @@ class spell_dk_master_of_ghouls : public AuraScript void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->SetShowDKPet(true); } void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - if (target->GetTypeId() == TYPEID_PLAYER) + if (target->IsPlayer()) target->ToPlayer()->SetShowDKPet(false); } @@ -780,7 +780,7 @@ class spell_dk_pet_scaling : public AuraScript amount = CalculatePct(std::max(0, owner->GetTotalAttackPowerValue(BASE_ATTACK)), modifier); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -1014,7 +1014,7 @@ class spell_dk_blood_boil : public SpellScript bool Load() override { _executed = false; - return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCaster()->IsClass(CLASS_DEATH_KNIGHT, CLASS_CONTEXT_ABILITY); + return GetCaster()->IsPlayer() && GetCaster()->IsClass(CLASS_DEATH_KNIGHT, CLASS_CONTEXT_ABILITY); } void HandleAfterHit() @@ -1291,7 +1291,7 @@ class spell_dk_death_grip : public SpellScript Unit* caster = GetCaster(); Unit* target = GetExplTargetUnit(); - if (target->GetTypeId() == TYPEID_PLAYER && caster->GetExactDist(target) < 8.0f) // xinef: should be 8.0f, but we have to add target size (1.5f) + if (target->IsPlayer() && caster->GetExactDist(target) < 8.0f) // xinef: should be 8.0f, but we have to add target size (1.5f) return SPELL_FAILED_TOO_CLOSE; if (caster->HasUnitState(UNIT_STATE_JUMPING) || caster->HasUnitMovementFlag(MOVEMENTFLAG_FALLING)) @@ -1569,7 +1569,7 @@ class spell_dk_icebound_fortitude : public AuraScript bool Load() override { Unit* caster = GetCaster(); - return caster && caster->GetTypeId() == TYPEID_PLAYER; + return caster && caster->IsPlayer(); } void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) @@ -1881,7 +1881,7 @@ class spell_dk_raise_dead : public SpellScript { _result = SPELL_CAST_OK; _corpse = false; - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } SpellCastResult CheckCast() @@ -2251,4 +2251,3 @@ void AddSC_deathknight_spell_scripts() RegisterSpellScript(spell_dk_will_of_the_necropolis); RegisterSpellScript(spell_dk_ghoul_thrash); } - diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 0b5970313..2057df054 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -355,7 +355,7 @@ class spell_dru_treant_scaling : public AuraScript amount = CalculatePct(std::max(0, nature), 15); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -791,7 +791,7 @@ class spell_dru_rip : public AuraScript bool Load() override { Unit* caster = GetCaster(); - return caster && caster->GetTypeId() == TYPEID_PLAYER; + return caster && caster->IsPlayer(); } void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) @@ -1005,7 +1005,7 @@ class spell_dru_swift_flight_passive : public AuraScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) @@ -1063,7 +1063,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void FilterTargets(std::list& targets) @@ -1151,7 +1151,7 @@ class spell_dru_berserk : public SpellScript { Unit* caster = GetCaster(); - if (caster->GetTypeId() == TYPEID_PLAYER) + if (caster->IsPlayer()) { // Remove tiger fury / mangle(bear) const uint32 TigerFury[6] = { 5217, 6793, 9845, 9846, 50212, 50213 }; @@ -1230,4 +1230,3 @@ void AddSC_druid_spell_scripts() RegisterSpellScript(spell_dru_wild_growth); RegisterSpellScript(spell_dru_moonkin_form_passive_proc); } - diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 7c0bc86d4..d5ca8b153 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -644,7 +644,7 @@ class spell_gen_area_aura_select_players : public AuraScript bool CheckAreaTarget(Unit* target) { - return target->GetTypeId() == TYPEID_PLAYER; + return target->IsPlayer(); } void Register() override { @@ -662,7 +662,7 @@ class spell_gen_area_aura_select_players_and_caster : public AuraScript bool CheckAreaTarget(Unit* target) { - return target->GetTypeId() == TYPEID_PLAYER || target == GetCaster(); + return target->IsPlayer() || target == GetCaster(); } void Register() override { @@ -1692,7 +1692,7 @@ class spell_gen_pet_summoned : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleScript(SpellEffIndex /*effIndex*/) @@ -1973,7 +1973,7 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -2097,7 +2097,7 @@ class spell_gen_divine_storm_cd_reset : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -2128,7 +2128,7 @@ class spell_gen_profession_research : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } SpellCastResult CheckRequirement() @@ -2358,7 +2358,7 @@ class spell_gen_seaforium_blast : public SpellScript bool Load() override { // OriginalCaster is always available in Spell::prepare - return GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; + return GetOriginalCaster()->IsPlayer(); } void AchievementCredit(SpellEffIndex /*effIndex*/) @@ -2501,7 +2501,7 @@ class spell_gen_vehicle_scaling_aura: public AuraScript bool Load() override { - return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER && GetOwner()->GetTypeId() == TYPEID_UNIT; + return GetCaster() && GetCaster()->IsPlayer() && GetOwner()->GetTypeId() == TYPEID_UNIT; } void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) @@ -2547,7 +2547,7 @@ class spell_gen_oracle_wolvar_reputation : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex effIndex) @@ -2667,7 +2667,7 @@ class spell_gen_spirit_healer_res : public SpellScript bool Load() override { - return GetOriginalCaster() && GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; + return GetOriginalCaster() && GetOriginalCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /* effIndex */) @@ -3243,7 +3243,7 @@ class spell_gen_tournament_duel : public SpellScript } else if (Unit* unitTarget = GetHitUnit()) { - if (unitTarget->GetCharmer() && unitTarget->GetCharmer()->GetTypeId() == TYPEID_PLAYER && unitTarget->GetCharmer()->HasAura(SPELL_ON_TOURNAMENT_MOUNT)) + if (unitTarget->GetCharmer() && unitTarget->GetCharmer()->IsPlayer() && unitTarget->GetCharmer()->HasAura(SPELL_ON_TOURNAMENT_MOUNT)) rider->CastSpell(unitTarget->GetCharmer(), SPELL_MOUNTED_DUEL, true); } } @@ -3450,7 +3450,7 @@ class spell_gen_on_tournament_mount : public AuraScript bool Load() override { _pennantSpellId = 0; - return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster() && GetCaster()->IsPlayer(); } void HandleApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -3630,7 +3630,7 @@ class spell_gen_tournament_pennant : public AuraScript bool Load() override { - return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster() && GetCaster()->IsPlayer(); } void HandleApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -3686,7 +3686,6 @@ class spell_gen_ds_flush_knockback : public SpellScript 60864 - Jaws of Death (spell_gen_default_count_pct_from_max_hp) 38441 - Cataclysmic Bolt (spell_gen_50pct_count_pct_from_max_hp) 66316, 67100, 67101, 67102 - Spinning Pain Spike (spell_gen_50pct_count_pct_from_max_hp) - 41360 - L5 Arcane Charge (spell_gen_100pct_count_pct_from_max_hp) 33711/38794 - Murmur's Touch */ class spell_gen_count_pct_from_max_hp : public SpellScript @@ -3953,7 +3952,7 @@ public: { if (GetCaster()) if (Unit* owner = GetCaster()->GetOwner()) - if (owner->GetTypeId() == TYPEID_PLAYER) /// @todo this check is maybe wrong + if (owner->IsPlayer()) /// @todo this check is maybe wrong owner->ToPlayer()->RemovePet(nullptr, PET_SAVE_NOT_IN_SLOT, true); } @@ -5424,7 +5423,6 @@ void AddSC_generic_spell_scripts() RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_default_count_pct_from_max_hp"); RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_10pct_count_pct_from_max_hp", 10); RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_50pct_count_pct_from_max_hp", 50); - RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_100pct_count_pct_from_max_hp", 100); RegisterSpellScript(spell_gen_despawn_self); RegisterSpellScript(spell_gen_bandage); RegisterSpellScript(spell_gen_paralytic_poison); @@ -5479,4 +5477,3 @@ void AddSC_generic_spell_scripts() RegisterSpellScript(spell_gen_sober_up); RegisterSpellScript(spell_gen_steal_weapon); } - diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 96ee8185a..378604983 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -231,7 +231,7 @@ class spell_hun_generic_scaling : public AuraScript amount = CalculatePct(std::max(0, owner->GetTotalAttackPowerValue(RANGED_ATTACK)), modifier); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -322,7 +322,7 @@ class spell_hun_aspect_of_the_beast : public AuraScript bool Load() override { - return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster() && GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -655,7 +655,7 @@ class spell_hun_readiness : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /*effIndex*/) @@ -708,7 +708,7 @@ class spell_hun_scatter_shot : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /*effIndex*/) @@ -930,7 +930,7 @@ class spell_hun_disengage : public SpellScript SpellCastResult CheckCast() { Unit* caster = GetCaster(); - if (caster->GetTypeId() == TYPEID_PLAYER && !caster->IsInCombat()) + if (caster->IsPlayer() && !caster->IsInCombat()) return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; return SPELL_CAST_OK; @@ -1378,4 +1378,3 @@ void AddSC_hunter_spell_scripts() RegisterSpellScript(spell_hun_bestial_wrath); RegisterSpellScript(spell_hun_target_self_and_pet); } - diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index b4fb5ffc1..343a5d514 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -608,7 +608,7 @@ class spell_item_feast : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleScriptEffect(SpellEffIndex effIndex) @@ -1275,7 +1275,7 @@ class spell_item_summon_argent_knight : public SpellScript { if (Unit* caster = GetCaster()) { - if (caster->GetTypeId() == TYPEID_PLAYER) + if (caster->IsPlayer()) { // summoning the "Argent Knight (Horde)" is default for spell 54307; if (caster->ToPlayer()->GetTeamId() == TEAM_ALLIANCE) @@ -1585,7 +1585,7 @@ class spell_item_deviate_fish : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -1813,7 +1813,7 @@ class spell_item_make_a_wish : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -2032,7 +2032,7 @@ class spell_item_noggenfogger_elixir : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -2102,7 +2102,7 @@ class spell_item_savory_deviate_delight : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -2156,7 +2156,7 @@ class spell_item_scroll_of_recall : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleScript(SpellEffIndex effIndex) @@ -2215,7 +2215,7 @@ class spell_item_dimensional_ripper_area52 : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleScript(SpellEffIndex /* effIndex */) @@ -2571,7 +2571,7 @@ class spell_item_underbelly_elixir : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -2619,7 +2619,7 @@ class spell_item_book_of_glyph_mastery : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } SpellCastResult CheckRequirement() @@ -2735,7 +2735,7 @@ class spell_item_ashbringer : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void OnDummyEffect(SpellEffIndex effIndex) @@ -2832,7 +2832,7 @@ class spell_item_purify_helboar_meat : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spell*/) override @@ -3042,7 +3042,7 @@ class spell_item_demon_broiled_surprise : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /* effIndex */) @@ -3249,7 +3249,7 @@ class spell_item_teach_language : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spell*/) override @@ -3282,7 +3282,7 @@ class spell_item_rocket_boots : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spell*/) override @@ -3320,7 +3320,7 @@ class spell_item_healing_injector : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleHeal(SpellEffIndex /*effIndex*/) @@ -3342,7 +3342,7 @@ class spell_item_mana_injector : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleEnergize(SpellEffIndex /*effIndex*/) @@ -3431,7 +3431,7 @@ class spell_item_chicken_cover : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spell*/) override @@ -3834,7 +3834,7 @@ class spell_item_worn_troll_dice : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleScript(SpellEffIndex /*effIndex*/) @@ -4176,4 +4176,3 @@ void AddSC_item_spell_scripts() RegisterSpellScript(spell_item_fel_mana_potion); RegisterSpellScript(spell_item_gor_dreks_ointment); } - diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 4b2243baa..13fbefcdd 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -267,7 +267,7 @@ class spell_mage_pet_scaling : public AuraScript amount = CalculatePct(std::max(0, frost), 33); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -459,7 +459,7 @@ class spell_mage_cold_snap : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /*effIndex*/) @@ -1083,4 +1083,3 @@ void AddSC_mage_spell_scripts() RegisterSpellScript(spell_mage_fingers_of_frost_proc_aura); RegisterSpellScript(spell_mage_fingers_of_frost_proc); } - diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 7dcdeb919..155c6276b 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -178,7 +178,7 @@ class spell_pal_divine_intervention : public AuraScript void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (!GetTarget()->IsInCombat() && GetTarget()->GetTypeId() == TYPEID_PLAYER) + if (!GetTarget()->IsInCombat() && GetTarget()->IsPlayer()) GetTarget()->RemoveAurasDueToSpell(GetTarget()->ToPlayer()->GetTeamId() == TEAM_ALLIANCE ? 57723 : 57724); } @@ -329,7 +329,7 @@ private: { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); - return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER; + return GetUnitOwner()->IsPlayer(); } void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) @@ -518,7 +518,7 @@ class spell_pal_divine_sacrifice : public AuraScript { if (Unit* caster = GetCaster()) { - if (caster->GetTypeId() == TYPEID_PLAYER) + if (caster->IsPlayer()) { if (caster->ToPlayer()->GetGroup()) groupSize = caster->ToPlayer()->GetGroup()->GetMembersCount(); @@ -1178,4 +1178,3 @@ void AddSC_paladin_spell_scripts() RegisterSpellScript(spell_pal_seal_of_righteousness); RegisterSpellScript(spell_pal_seal_of_vengeance); } - diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 04b7aebce..0d02279f2 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -118,7 +118,7 @@ class spell_pri_shadowfiend_scaling : public AuraScript amount = CalculatePct(std::max(0, shadow), 30); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -552,7 +552,7 @@ class spell_pri_penance : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* spellInfo) override @@ -782,7 +782,7 @@ class spell_pri_renew : public AuraScript bool Load() override { - return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster() && GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -974,4 +974,3 @@ void AddSC_priest_spell_scripts() RegisterSpellScript(spell_pri_mind_control); RegisterSpellScript(spell_pri_t4_4p_bonus); } - diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index d1f88f153..cfcad45ee 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -201,7 +201,7 @@ class spell_q11026_a11051_banish_the_demons : public SpellScript { if (Unit* target = GetHitUnit()) if (Unit* owner = target->ToTempSummon()->GetSummonerUnit()) - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->ToPlayer()->KilledMonsterCredit(23327); // Some trigger, just count } @@ -652,7 +652,7 @@ class spell_q13369_fate_up_against_your_will : public SpellScript { // Fate, Up Against Your Will (13369) if (Unit* caster = GetCaster()) - if (caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(13369) >= QUEST_STATUS_COMPLETE) + if (caster->IsPlayer() && caster->ToPlayer()->GetQuestStatus(13369) >= QUEST_STATUS_COMPLETE) return SPELL_CAST_OK; return SPELL_FAILED_DONT_REPORT; } @@ -864,7 +864,7 @@ class spell_q5206_test_fetid_skull : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -903,7 +903,7 @@ class spell_q6124_6129_apply_salve : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /*effIndex*/) @@ -1108,7 +1108,7 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCastItem(); + return GetCaster()->IsPlayer() && GetCastItem(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -1346,7 +1346,7 @@ class spell_q12937_relief_for_the_fallen : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -1452,7 +1452,7 @@ class spell_q12659_ahunaes_knife : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /*effIndex*/) @@ -1483,7 +1483,7 @@ class spell_q9874_liquid_fire : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /*effIndex*/) @@ -1515,7 +1515,7 @@ class spell_q12805_lifeblood_dummy : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleScript(SpellEffIndex /*effIndex*/) @@ -1616,7 +1616,7 @@ class spell_q9452_cast_net : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } SpellCastResult CheckCast() @@ -2523,4 +2523,3 @@ void AddSC_quest_spell_scripts() RegisterSpellScript(spell_q10651_q10692_book_of_fel_names); RegisterSpellScript(spell_q9847_a_spirit_ally); } - diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index a0b998f99..bbdb9314a 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -201,7 +201,7 @@ class spell_rog_deadly_poison : public SpellScript { _stackAmount = 0; // at this point CastItem must already be initialized - return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCastItem(); + return GetCaster()->IsPlayer() && GetCastItem(); } void HandleBeforeHit(SpellMissInfo missInfo) @@ -438,7 +438,7 @@ class spell_rog_preparation : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -505,7 +505,7 @@ class spell_rog_prey_on_the_weak : public AuraScript { Unit* target = GetTarget(); Unit* victim = target->GetVictim(); - if (!victim && target->GetTypeId() == TYPEID_PLAYER) + if (!victim && target->IsPlayer()) victim = target->ToPlayer()->GetSelectedUnit(); if (victim && (target->GetHealthPct() > victim->GetHealthPct())) @@ -534,7 +534,7 @@ class spell_rog_rupture : public AuraScript bool Load() override { Unit* caster = GetCaster(); - return caster && caster->GetTypeId() == TYPEID_PLAYER; + return caster && caster->IsPlayer(); } void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) @@ -574,7 +574,7 @@ class spell_rog_shiv : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -771,4 +771,3 @@ void AddSC_rogue_spell_scripts() RegisterSpellScript(spell_rog_vanish_purge); RegisterSpellScript(spell_rog_vanish); } - diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 415f609fe..28b61ef54 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -215,7 +215,7 @@ class spell_sha_feral_spirit_scaling : public AuraScript amount = CalculatePct(std::max(0, owner->GetTotalAttackPowerValue(BASE_ATTACK)), modifier); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -324,7 +324,7 @@ class spell_sha_fire_elemental_scaling : public AuraScript amount = CalculatePct(std::max(0, fire), 100); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -951,7 +951,7 @@ class spell_sha_lava_lash : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } void HandleDummy(SpellEffIndex /*effIndex*/) @@ -1049,7 +1049,7 @@ class spell_sha_sentry_totem : public AuraScript void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) - if (caster->GetTypeId() == TYPEID_PLAYER) + if (caster->IsPlayer()) caster->ToPlayer()->StopCastingBindSight(); } @@ -1177,4 +1177,3 @@ void AddSC_shaman_spell_scripts() RegisterSpellScript(spell_sha_flurry_proc); RegisterSpellScript(spell_sha_t8_electrified); } - diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 7d96f4fd9..c27856ccd 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -171,7 +171,7 @@ class spell_warl_improved_demonic_tactics : public AuraScript bool Load() override { - return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER; + return GetUnitOwner()->IsPlayer(); } void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude) @@ -223,7 +223,7 @@ class spell_warl_ritual_of_summoning : public SpellScript SpellCastResult CheckCast() { - if (GetCaster()->GetTypeId() == TYPEID_PLAYER) + if (GetCaster()->IsPlayer()) if (GetCaster()->ToPlayer()->InBattleground()) return SPELL_FAILED_NOT_IN_BATTLEGROUND; return SPELL_CAST_OK; @@ -339,7 +339,7 @@ class spell_warl_generic_scaling : public AuraScript amount = CalculatePct(std::max(0, maximum), 15); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -450,7 +450,7 @@ class spell_warl_infernal_scaling : public AuraScript amount = CalculatePct(std::max(0, maximum), 15); // xinef: Update appropriate player field - if (owner->GetTypeId() == TYPEID_PLAYER) + if (owner->IsPlayer()) owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount); } } @@ -900,7 +900,7 @@ class spell_warl_life_tap : public SpellScript bool Load() override { - return GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster()->IsPlayer(); } bool Validate(SpellInfo const* /*spell*/) override @@ -1147,7 +1147,7 @@ class spell_warl_curse_of_doom : public AuraScript bool Load() override { - return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; + return GetCaster() && GetCaster()->IsPlayer(); } void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) @@ -1322,7 +1322,7 @@ class spell_warl_drain_soul : public AuraScript Unit* caster = GetCaster(); Unit* target = GetTarget(); - if (caster && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->isHonorOrXPTarget(target)) + if (caster && caster->IsPlayer() && caster->ToPlayer()->isHonorOrXPTarget(target)) { if (roll_chance_i(20)) { @@ -1532,4 +1532,3 @@ void AddSC_warlock_spell_scripts() RegisterSpellScript(spell_warl_glyph_of_voidwalker); RegisterSpellScript(spell_warl_demonic_pact_aura); } - diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 675907e02..1e848b0a4 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -923,4 +923,3 @@ void AddSC_warrior_spell_scripts() RegisterSpellScript(spell_warr_vigilance_trigger); RegisterSpellScript(spell_warr_t3_prot_8p_bonus); } - diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 541bebaa8..7f4d76687 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -450,4 +450,3 @@ void AddSC_areatrigger_scripts() new AreaTrigger_at_brewfest(); new AreaTrigger_at_area_52_entrance(); } - diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index e75faa46d..2cf818614 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -114,7 +114,7 @@ struct emerald_dragonAI : public WorldBossAI // Target killed during encounter, mark them as suspectible for Aura Of Nature void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) who->CastSpell(who, SPELL_MARK_OF_NATURE, true); } @@ -431,7 +431,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - if (spell->Id == SPELL_DRAW_SPIRIT && target->GetTypeId() == TYPEID_PLAYER) + if (spell->Id == SPELL_DRAW_SPIRIT && target->IsPlayer()) { Position targetPos = target->GetPosition(); me->SummonCreature(NPC_SPIRIT_SHADE, targetPos, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 50000); @@ -531,7 +531,7 @@ public: void KilledUnit(Unit* who) override { - if (who->GetTypeId() == TYPEID_PLAYER) + if (who->IsPlayer()) { who->CastSpell(who, SPELL_PUTRID_MUSHROOM, true); } @@ -860,4 +860,3 @@ void AddSC_emerald_dragons() RegisterSpellScript(spell_mark_of_nature); RegisterSpellScript(spell_shadow_bolt_whirl); }; - diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index b58ee8117..47863dbcd 100644 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -159,4 +159,3 @@ void AddSC_chat_log() { new ChatLogScript(); } - diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 9067db635..18c16a4c2 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1991,4 +1991,3 @@ void AddSC_go_scripts() new go_veil_skith_cage(); new go_bells(); } - diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 6e483cba2..f49afe314 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -81,7 +81,7 @@ public: else if (banishTimer <= diff) { Unit* temp = me->GetVictim(); - if (temp && temp->GetTypeId() == TYPEID_PLAYER) + if (temp && temp->IsPlayer()) { DoCast(temp, SPELL_BANISHED_SHATTRATH_A); banishTimer = 9000; @@ -148,7 +148,7 @@ public: else if (banishTimer <= diff) { Unit* temp = me->GetVictim(); - if (temp && temp->GetTypeId() == TYPEID_PLAYER) + if (temp && temp->IsPlayer()) { DoCast(temp, SPELL_BANISHED_SHATTRATH_S); banishTimer = 9000; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index cddafb57d..6d3bafd05 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -223,4 +223,3 @@ void AddSC_item_scripts() new item_captured_frog(); new item_generic_limit_chance_above_60(); } - diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 78783d1ab..e98676dcf 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -1375,4 +1375,3 @@ void AddSC_npc_professions() new npc_prof_tailor(); new go_evil_book_for_dummies(); } - diff --git a/src/server/scripts/World/npc_stave_of_ancients.cpp b/src/server/scripts/World/npc_stave_of_ancients.cpp index 8793f5b54..bf80e6bd5 100644 --- a/src/server/scripts/World/npc_stave_of_ancients.cpp +++ b/src/server/scripts/World/npc_stave_of_ancients.cpp @@ -55,7 +55,7 @@ void NPCStaveQuestAI::StorePlayerGUID() for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) { - if ((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER) + if ((*itr)->getTarget()->IsPlayer()) { playerGUID = (*itr)->getUnitGuid(); } diff --git a/src/server/scripts/World/player_scripts.cpp b/src/server/scripts/World/player_scripts.cpp index 845c96c2b..9fee806a1 100644 --- a/src/server/scripts/World/player_scripts.cpp +++ b/src/server/scripts/World/player_scripts.cpp @@ -70,4 +70,3 @@ void AddSC_player_scripts() { new QuestApprenticeAnglerPlayerScript(); } - diff --git a/src/server/scripts/World/server_mail.cpp b/src/server/scripts/World/server_mail.cpp index 22f632db1..16935a733 100644 --- a/src/server/scripts/World/server_mail.cpp +++ b/src/server/scripts/World/server_mail.cpp @@ -79,4 +79,3 @@ void AddSC_server_mail() { new ServerMailReward(); } -