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

File tree

39 files changed

+290
-152
lines changed

39 files changed

+290
-152
lines changed

‎apps/docker/Dockerfile

Lines changed: 12 additions & 12 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 6 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 7 additions & 0 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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';

0 commit comments

Comments
 (0)