Skip to content

Commit f93a683

Browse files
author
Github Actions
committed
Merge 3.3.5 to npcbots_3.3.5
2 parents 8b0b463 + 30a7901 commit f93a683

39 files changed

+290
-152
lines changed

‎apps/docker/Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ FROM ubuntu:$UBUNTU_VERSION AS skeleton
88
ARG DOCKER=1
99
ARG DEBIAN_FRONTEND=noninteractive
1010

11-
ENV TZ=$TZ
1211
ENV AC_FORCE_CREATE_DB=1
1312

1413
RUN mkdir -pv \
@@ -29,11 +28,12 @@ RUN mkdir -pv \
2928
/azerothcore/build
3029

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

3838
WORKDIR /azerothcore
3939

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

147147
FROM runtime AS authserver
148-
LABEL description "AzerothCore Auth Server"
148+
LABEL description="AzerothCore Auth Server"
149149

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

168168
FROM runtime AS worldserver
169169

170-
LABEL description "AzerothCore World Server"
170+
LABEL description="AzerothCore World Server"
171171

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

191191
FROM runtime AS db-import
192192

193-
LABEL description "AzerothCore Database Import tool"
193+
LABEL description="AzerothCore Database Import tool"
194194

195195
USER $DOCKER_USER
196196

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

206-
CMD /azerothcore/env/dist/bin/dbimport
206+
CMD [ "/azerothcore/env/dist/bin/dbimport" ]
207207

208208
###############
209209
# Client Data #
@@ -225,15 +225,15 @@ VOLUME /azerothcore/env/dist/data
225225

226226
USER $DOCKER_USER
227227

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

230230
##################
231231
# Map Extractors #
232232
##################
233233

234234
FROM runtime AS tools
235235

236-
LABEL description "AzerothCore Tools"
236+
LABEL description="AzerothCore Tools"
237237

238238
WORKDIR /azerothcore/env/dist/
239239

‎apps/installer/includes/functions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function inst_configureOS() {
3939
# TODO: implement different configurations by distro
4040
source "$AC_PATH_INSTALLER/includes/os_configs/$DISTRO.sh"
4141
;;
42-
bsd*) echo "BSD is not supported yet" ;;
42+
*bsd*) echo "BSD is not supported yet" ;;
4343
msys*) source "$AC_PATH_INSTALLER/includes/os_configs/windows.sh" ;;
4444
*) echo "This platform is not supported" ;;
4545
esac

‎data/sql/updates/db_world/2024_08_17_00.sql

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2024_08_13_03 -> 2024_08_17_00
2+
--
3+
UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256, `mechanic_immune_mask` = `mechanic_immune_mask`|33554432 WHERE `entry` = 22950;

‎data/sql/updates/db_world/2024_08_17_01.sql

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2024_08_17_00 -> 2024_08_17_01
2+
--
3+
UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256 WHERE `entry` = 22949;

‎data/sql/updates/db_world/2024_08_17_02.sql

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2024_08_17_01 -> 2024_08_17_02
2+
--
3+
UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`&~2048 WHERE `entry` = 22952;

‎data/sql/updates/db_world/2024_08_18_00.sql

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-- DB update 2024_08_17_02 -> 2024_08_18_00
2+
-- fix spells and timer of Aether Ray (22181)
3+
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 22181) AND (`source_type` = 0) AND (`id` IN (0, 2));
4+
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
5+
(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\''),
6+
(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\'');

‎data/sql/updates/db_world/2024_08_19_00.sql

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2024_08_18_00 -> 2024_08_19_00
2+
--
3+
UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256 WHERE `entry` IN (23418, 23419);

‎data/sql/updates/db_world/2024_08_19_01.sql

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- DB update 2024_08_19_00 -> 2024_08_19_01
2+
-- Fix spells timers for Hemathion (18692)
3+
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 18692) AND (`source_type` = 0) AND (`id` IN (0, 1, 2));
4+
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
5+
(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'),
6+
(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'),
7+
(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)');

‎data/sql/updates/db_world/2024_08_19_02.sql

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- DB update 2024_08_19_01 -> 2024_08_19_02
2+
UPDATE `creature_template` SET `minlevel` = 68, `maxlevel` = 80, `exp` = 0, `DamageModifier` = 1, `unit_class` = 2 WHERE `entry` = 15438;

‎data/sql/updates/db_world/2024_08_20_00.sql

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2024_08_19_02 -> 2024_08_20_00
2+
--
3+
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_mother_shahraz_fatal_attraction_aura';

‎data/sql/updates/db_world/2024_08_21_00.sql

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
-- DB update 2024_08_20_00 -> 2024_08_21_00
2+
-- .
3+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=1428;
4+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
5+
(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");
6+
7+
UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (1428, 1433);
8+
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1428, 1433, 143300, 143301, 143302);
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
10+
(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"),
11+
12+
(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"),
13+
(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"),
14+
(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"),
15+
(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"),
16+
(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"),
17+
(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"),
18+
(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"),
19+
(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"),
20+
21+
(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)"),
22+
(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"),
23+
(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"),
24+
25+
(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"),
26+
(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"),
27+
(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)"),
28+
(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"),
29+
30+
(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"),
31+
(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"),
32+
(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)"),
33+
(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"),
34+
(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");
35+
36+
DELETE FROM `waypoints` WHERE `entry`=1433;
37+
INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
38+
(1433, 1, -8766.4648, 716.7565, 99.5340, "Corbett Schneider"),
39+
(1433, 2, -8756.1455, 726.3924, 98.1680, "Corbett Schneider"),
40+
(1433, 3, -8736.9951, 700.4968, 98.6993, "Corbett Schneider"),
41+
(1433, 4, -8752.06, 687.8629, 100.4303, "Corbett Schneider"),
42+
(1433, 5, -8762.08, 680.5356, 101.7102, "Corbett Schneider"),
43+
(1433, 6, -8772.759, 671.8912, 103.0923, "Corbett Schneider"),
44+
(1433, 7, -8772.768, 667.782, 103.4332, "Corbett Schneider"),
45+
(1433, 8, -8773.276, 664.1729, 103.2741, "Corbett Schneider"),
46+
(1433, 9, -8768.034, 657.9344, 103.6037, "Corbett Schneider"),
47+
(1433, 10, -8761.147, 647.2188, 103.86, "Corbett Schneider"),
48+
(1433, 11, -8759.447, 638.8893, 103.3162, "Corbett Schneider"),
49+
(1433, 12, -8758.039, 628.078, 102.0694, "Corbett Schneider"),
50+
(1433, 13, -8761.208, 620.6109, 99.95255, "Corbett Schneider"),
51+
(1433, 14, -8767.146, 612.2792, 97.46174, "Corbett Schneider"),
52+
(1433, 15, -8777.32, 603.8011, 97.09476, "Corbett Schneider"),
53+
(1433, 16, -8793.533, 591.5438, 97.66048, "Corbett Schneider"),
54+
(1433, 17, -8798.256, 589.9958, 97.36029, "Corbett Schneider"),
55+
(1433, 18, -8803.463, 592.6121, 97.25187, "Corbett Schneider"),
56+
(1433, 19, -8808.244, 598.1001, 96.85836, "Corbett Schneider"),
57+
(1433, 20, -8813.239, 605.8572, 96.07804, "Corbett Schneider"),
58+
(1433, 21, -8819.136, 613.8248, 95.15321, "Corbett Schneider"),
59+
(1433, 22, -8821.637, 620.8274, 94.33056, "Corbett Schneider"),
60+
(1433, 23, -8820.776, 625.7927, 93.82214, "Corbett Schneider"),
61+
(1433, 24, -8816.414, 628.6717, 94.11055, "Corbett Schneider"),
62+
(1433, 25, -8809.802, 631.7798, 94.22869, "Corbett Schneider"),
63+
(1433, 26, -8801.114, 634.4752, 94.22869, "Corbett Schneider"),
64+
(1433, 27, -8793.909, 634.5373, 94.32002, "Corbett Schneider"),
65+
(1433, 28, -8788.455, 635.6047, 94.8966, "Corbett Schneider"),
66+
(1433, 29, -8783.56, 636.822, 97.24657, "Corbett Schneider"),
67+
(1433, 30, -8781.598, 636.8708, 97.22314, "Corbett Schneider"),
68+
(1433, 31, -8781.735, 638.8378, 97.22314, "Corbett Schneider"),
69+
(1433, 32, -8781.778, 636.7758, 97.22314, "Corbett Schneider"),
70+
(1433, 33, -8795.15, 634.1953, 94.28103, "Corbett Schneider"),
71+
(1433, 34, -8801.708, 633.1341, 94.22869, "Corbett Schneider"),
72+
(1433, 35, -8817.858, 626.8513, 93.98212, "Corbett Schneider"),
73+
(1433, 36, -8828.889, 622.524, 93.88631, "Corbett Schneider"),
74+
(1433, 37, -8840.156, 612.7209, 92.8798, "Corbett Schneider"),
75+
(1433, 38, -8847.144, 604.3766, 92.36099, "Corbett Schneider"),
76+
(1433, 39, -8852.638, 595.577, 92.37487, "Corbett Schneider"),
77+
(1433, 40, -8863.147, 582.9686, 93.46239, "Corbett Schneider"),
78+
(1433, 41, -8848.96, 570.478, 96.0, "Corbett Schneider"),
79+
(1433, 42, -8859.677, 580.5781, 94.49109, "Corbett Schneider"),
80+
(1433, 43, -8862.987, 584.5252, 93.1463, "Corbett Schneider"),
81+
(1433, 44, -8840.954, 607.2128, 93.16522, "Corbett Schneider"),
82+
(1433, 45, -8837.177, 617.1418, 93.02146, "Corbett Schneider"),
83+
(1433, 46, -8839.63, 632.0125, 94.44655, "Corbett Schneider"),
84+
(1433, 47, -8845.286, 644.3653, 96.2437, "Corbett Schneider"),
85+
(1433, 48, -8849.153, 651.5832, 96.53387, "Corbett Schneider"),
86+
(1433, 49, -8851.61, 661.0834, 97.05186, "Corbett Schneider"),
87+
(1433, 50, -8845.611, 665.9679, 97.63871, "Corbett Schneider"),
88+
(1433, 51, -8837.404, 671.1436, 98.19347, "Corbett Schneider"),
89+
(1433, 52, -8825.113, 679.1154, 97.53572, "Corbett Schneider"),
90+
(1433, 53, -8830.587, 690.738, 97.36238, "Corbett Schneider"),
91+
(1433, 54, -8841.896, 715.2056, 97.55064, "Corbett Schneider"),
92+
(1433, 55, -8842.827, 723.2777, 97.29913, "Corbett Schneider"),
93+
(1433, 56, -8834.735, 728.9673, 97.85699, "Corbett Schneider"),
94+
(1433, 57, -8819.055, 738.2991, 97.92567, "Corbett Schneider"),
95+
(1433, 58, -8803.791, 745.3076, 97.57478, "Corbett Schneider"),
96+
(1433, 59, -8787.081, 745.6882, 98.51132, "Corbett Schneider"),
97+
(1433, 60, -8773.176, 740.5723, 99.45663, "Corbett Schneider"),
98+
(1433, 61, -8764.434, 735.3757, 98.88588, "Corbett Schneider"),
99+
(1433, 62, -8758.341, 726.0469, 98.21922, "Corbett Schneider"),
100+
(1433, 63, -8762.695, 720.631, 99.53365, "Corbett Schneider"),
101+
(1433, 64, -8767.639, 715.3578, 99.53385, "Corbett Schneider"),
102+
(1433, 65, -8773.21, 714.8073, 99.53385, "Corbett Schneider"),
103+
(1433, 66, -8777.759, 715.541, 99.52771, "Corbett Schneider"),
104+
(1433, 67, -8780.018, 717.4185, 99.53414, "Corbett Schneider"),
105+
(1433, 68, -8776.452, 719.8099, 101.5017, "Corbett Schneider"),
106+
(1433, 69, -8773.681, 722.051, 104.1553, "Corbett Schneider"),
107+
(1433, 70, -8771.129, 724.3008, 105.9132, "Corbett Schneider");

‎data/sql/updates/db_world/2024_08_22_00.sql

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2024_08_21_00 -> 2024_08_22_00
2+
--
3+
DELETE FROM `event_scripts` WHERE `id` = 14797;

‎data/sql/updates/db_world/2024_08_22_01.sql

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-- DB update 2024_08_22_00 -> 2024_08_22_01
2+
-- Set RequiredNpcOrGo1 of quest 6661 Deeprun Rat Roundup to 13017
3+
UPDATE `quest_template` SET `RequiredNpcOrGo1`=13017 WHERE `ID`=6661;
4+
5+
-- Set quest credit to unit 13017 in 'Deeprun Rat - On Spellhit - Quest Credit'
6+
UPDATE `smart_scripts` SET `action_param1`=13017 WHERE `entryorguid`=13016 AND `source_type`=0 AND `id`=2 AND `link`=3;

‎src/common/Utilities/StartProcess.cpp

+1-7
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@
2222
#include "Util.h"
2323
#include <boost/algorithm/string/join.hpp>
2424
#include <boost/iostreams/copy.hpp>
25-
#include <boost/process/args.hpp>
26-
#include <boost/process/child.hpp>
27-
#include <boost/process/env.hpp>
28-
#include <boost/process/exe.hpp>
29-
#include <boost/process/io.hpp>
30-
#include <boost/process/pipe.hpp>
31-
#include <boost/process/search_path.hpp>
25+
#include "boost/process.hpp"
3226
#include <filesystem>
3327

3428
using namespace boost::process;

‎src/server/game/AI/CoreAI/PassiveAI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ NullCreatureAI::NullCreatureAI(Creature* c) : CreatureAI(c) { me->SetReactState(
2525

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

3131
if (creature->IsTrigger())

‎src/server/game/AI/SmartScripts/SmartScript.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2064,21 +2064,21 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
20642064
{
20652065
for (WorldObject* target : targets)
20662066
if (IsCreature(target))
2067-
target->ToUnit()->SetUInt32Value(UNIT_NPC_FLAGS, e.action.unitFlag.flag);
2067+
target->ToUnit()->ReplaceAllNpcFlags(NPCFlags(e.action.unitFlag.flag));
20682068
break;
20692069
}
20702070
case SMART_ACTION_ADD_NPC_FLAG:
20712071
{
20722072
for (WorldObject* target : targets)
20732073
if (IsCreature(target))
2074-
target->ToUnit()->SetFlag(UNIT_NPC_FLAGS, e.action.unitFlag.flag);
2074+
target->ToUnit()->SetNpcFlag(NPCFlags(e.action.unitFlag.flag));
20752075
break;
20762076
}
20772077
case SMART_ACTION_REMOVE_NPC_FLAG:
20782078
{
20792079
for (WorldObject* target : targets)
20802080
if (IsCreature(target))
2081-
target->ToUnit()->RemoveFlag(UNIT_NPC_FLAGS, e.action.unitFlag.flag);
2081+
target->ToUnit()->RemoveNpcFlag(NPCFlags(e.action.unitFlag.flag));
20822082
break;
20832083
}
20842084
case SMART_ACTION_CROSS_CAST:

0 commit comments

Comments
 (0)