Skip to content

Commit

Permalink
Merge 3.3.5 to npcbots_3.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Github Actions committed Aug 23, 2024
2 parents 8b0b463 + 30a7901 commit f93a683
Show file tree
Hide file tree
Showing 39 changed files with 290 additions and 152 deletions.
24 changes: 12 additions & 12 deletions apps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ FROM ubuntu:$UBUNTU_VERSION AS skeleton
ARG DOCKER=1
ARG DEBIAN_FRONTEND=noninteractive

ENV TZ=$TZ
ENV AC_FORCE_CREATE_DB=1

RUN mkdir -pv \
Expand All @@ -29,11 +28,12 @@ RUN mkdir -pv \
/azerothcore/build

# Configure Timezone
RUN apt-get update \
&& apt-get install -y tzdata ca-certificates \
&& ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
&& echo $TZ > /etc/timezone \
&& dpkg-reconfigure --frontend noninteractive tzdata
RUN apt-get update \
&& apt-get install -y --no-install-recommends tzdata ca-certificates \
&& ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime \
&& echo "$TZ" > /etc/timezone \
&& dpkg-reconfigure --frontend noninteractive tzdata \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /azerothcore

Expand Down Expand Up @@ -145,7 +145,7 @@ ENTRYPOINT ["/usr/bin/env", "bash", "/azerothcore/entrypoint.sh"]
###############

FROM runtime AS authserver
LABEL description "AzerothCore Auth Server"
LABEL description="AzerothCore Auth Server"

ENV ACORE_COMPONENT=authserver
# Don't run database migrations. We can leave that up to the db-import container
Expand All @@ -167,7 +167,7 @@ CMD ["authserver"]

FROM runtime AS worldserver

LABEL description "AzerothCore World Server"
LABEL description="AzerothCore World Server"

ENV ACORE_COMPONENT=worldserver
# Don't run database migrations. We can leave that up to the db-import container
Expand All @@ -190,7 +190,7 @@ CMD ["worldserver"]

FROM runtime AS db-import

LABEL description "AzerothCore Database Import tool"
LABEL description="AzerothCore Database Import tool"

USER $DOCKER_USER

Expand All @@ -203,7 +203,7 @@ COPY --chown=$DOCKER_USER:$DOCKER_USER\
--from=build \
/azerothcore/env/dist/bin/dbimport /azerothcore/env/dist/bin/dbimport

CMD /azerothcore/env/dist/bin/dbimport
CMD [ "/azerothcore/env/dist/bin/dbimport" ]

###############
# Client Data #
Expand All @@ -225,15 +225,15 @@ VOLUME /azerothcore/env/dist/data

USER $DOCKER_USER

CMD bash -c "source /azerothcore/apps/installer/includes/functions.sh && inst_download_client_data"
CMD ["bash", "-c", "source /azerothcore/apps/installer/includes/functions.sh && inst_download_client_data" ]

##################
# Map Extractors #
##################

FROM runtime AS tools

LABEL description "AzerothCore Tools"
LABEL description="AzerothCore Tools"

WORKDIR /azerothcore/env/dist/

Expand Down
2 changes: 1 addition & 1 deletion apps/installer/includes/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function inst_configureOS() {
# TODO: implement different configurations by distro
source "$AC_PATH_INSTALLER/includes/os_configs/$DISTRO.sh"
;;
bsd*) echo "BSD is not supported yet" ;;
*bsd*) echo "BSD is not supported yet" ;;
msys*) source "$AC_PATH_INSTALLER/includes/os_configs/windows.sh" ;;
*) echo "This platform is not supported" ;;
esac
Expand Down
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_08_17_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2024_08_13_03 -> 2024_08_17_00
--
UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256, `mechanic_immune_mask` = `mechanic_immune_mask`|33554432 WHERE `entry` = 22950;
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_08_17_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2024_08_17_00 -> 2024_08_17_01
--
UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256 WHERE `entry` = 22949;
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_08_17_02.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2024_08_17_01 -> 2024_08_17_02
--
UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`&~2048 WHERE `entry` = 22952;
6 changes: 6 additions & 0 deletions data/sql/updates/db_world/2024_08_18_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-- DB update 2024_08_17_02 -> 2024_08_18_00
-- fix spells and timer of Aether Ray (22181)
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 22181) AND (`source_type` = 0) AND (`id` IN (0, 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
(22181, 0, 0, 0, 0, 0, 100, 0, 5000, 15000, 20000, 20000, 0, 0, 11, 35333, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Aether Ray - In Combat - Cast \'Tail Swipe\''),
(22181, 0, 2, 0, 3, 0, 100, 0, 0, 75, 20000, 20000, 0, 0, 11, 17008, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Aether Ray - Between 0-75% Mana - Cast \'Mana Drain\'');
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_08_19_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2024_08_18_00 -> 2024_08_19_00
--
UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256 WHERE `entry` IN (23418, 23419);
7 changes: 7 additions & 0 deletions data/sql/updates/db_world/2024_08_19_01.sql
Original file line number Diff line number Diff line change
@@ -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)');
2 changes: 2 additions & 0 deletions data/sql/updates/db_world/2024_08_19_02.sql
Original file line number Diff line number Diff line change
@@ -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;
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_08_20_00.sql
Original file line number Diff line number Diff line change
@@ -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';
107 changes: 107 additions & 0 deletions data/sql/updates/db_world/2024_08_21_00.sql
Original file line number Diff line number Diff line change
@@ -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");
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_08_22_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2024_08_21_00 -> 2024_08_22_00
--
DELETE FROM `event_scripts` WHERE `id` = 14797;
6 changes: 6 additions & 0 deletions data/sql/updates/db_world/2024_08_22_01.sql
Original file line number Diff line number Diff line change
@@ -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;
8 changes: 1 addition & 7 deletions src/common/Utilities/StartProcess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@
#include "Util.h"
#include <boost/algorithm/string/join.hpp>
#include <boost/iostreams/copy.hpp>
#include <boost/process/args.hpp>
#include <boost/process/child.hpp>
#include <boost/process/env.hpp>
#include <boost/process/exe.hpp>
#include <boost/process/io.hpp>
#include <boost/process/pipe.hpp>
#include <boost/process/search_path.hpp>
#include "boost/process.hpp"
#include <filesystem>

using namespace boost::process;
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/AI/CoreAI/PassiveAI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ NullCreatureAI::NullCreatureAI(Creature* c) : CreatureAI(c) { me->SetReactState(

int32 NullCreatureAI::Permissible(Creature const* creature)
{
if (creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK))
if (creature->HasNpcFlag(UNIT_NPC_FLAG_SPELLCLICK))
return PERMIT_BASE_PROACTIVE + 50;

if (creature->IsTrigger())
Expand Down
6 changes: 3 additions & 3 deletions src/server/game/AI/SmartScripts/SmartScript.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2064,21 +2064,21 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{
for (WorldObject* target : targets)
if (IsCreature(target))
target->ToUnit()->SetUInt32Value(UNIT_NPC_FLAGS, e.action.unitFlag.flag);
target->ToUnit()->ReplaceAllNpcFlags(NPCFlags(e.action.unitFlag.flag));
break;
}
case SMART_ACTION_ADD_NPC_FLAG:
{
for (WorldObject* target : targets)
if (IsCreature(target))
target->ToUnit()->SetFlag(UNIT_NPC_FLAGS, e.action.unitFlag.flag);
target->ToUnit()->SetNpcFlag(NPCFlags(e.action.unitFlag.flag));
break;
}
case SMART_ACTION_REMOVE_NPC_FLAG:
{
for (WorldObject* target : targets)
if (IsCreature(target))
target->ToUnit()->RemoveFlag(UNIT_NPC_FLAGS, e.action.unitFlag.flag);
target->ToUnit()->RemoveNpcFlag(NPCFlags(e.action.unitFlag.flag));
break;
}
case SMART_ACTION_CROSS_CAST:
Expand Down
Loading

0 comments on commit f93a683

Please sign in to comment.