yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(Docker): update to Ubuntu 20.04 + more improvements (#3277)

Browse Source
This commit is contained in:
Francesco Borzì
2020-08-13 00:25:20 +02:00
committed by GitHub
parent c83c53e718
commit d2cc3fcbc2
14 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/core_build.yml vendored
View File

@@ -57,4 +57,4 @@ jobs:
./bin/acore-docker-generate-etc ./bin/acore-docker-generate-etc
- name: Build - name: Build
run: | run: |
./bin/acore-docker-build-no-scripts ./bin/acore-docker-build

0
bin/acore-docker-remove-build-cache Normal file → Executable file
View File

4
docker/authserver/Dockerfile
View File

@@ -1,7 +1,7 @@
FROM ubuntu:bionic FROM ubuntu:20.04
# install the required dependencies to run the authserver # install the required dependencies to run the authserver
RUN apt update && apt install -y libmysqlclient-dev libssl-dev libace-6.* libace-dev net-tools; RUN apt update && apt install -y libmysqlclient-dev libssl-dev libace-6.4.5 libace-dev net-tools;
HEALTHCHECK --interval=5s --timeout=15s --start-period=30s --retries=3 CMD netstat -lnpt | grep :3724 || exit 1 HEALTHCHECK --interval=5s --timeout=15s --start-period=30s --retries=3 CMD netstat -lnpt | grep :3724 || exit 1

5
docker/build/Dockerfile
View File

@@ -1,7 +1,8 @@
FROM ubuntu:bionic FROM ubuntu:20.04
# install the required dependencies to compile AzerothCore # install the required dependencies to compile AzerothCore
RUN apt update && apt install -y git cmake make gcc g++ clang libmysqlclient-dev libssl-dev libbz2-dev libreadline-dev libncurses-dev libace-6.* libace-dev ARG DEBIAN_FRONTEND=noninteractive
RUN apt update && apt install -y git cmake make gcc g++ clang libmysqlclient-dev libssl-dev libbz2-dev libreadline-dev libncurses-dev libace-6.4.5 libace-dev
# copy the sources from the host machine to the Docker container # copy the sources from the host machine to the Docker container
ADD .git /azerothcore/.git ADD .git /azerothcore/.git

4
docker/worldserver/Dockerfile
View File

@@ -1,7 +1,7 @@
FROM ubuntu:bionic FROM ubuntu:20.04
# install the required dependencies to run the authserver # install the required dependencies to run the authserver
RUN apt update && apt install -y libmysqlclient-dev libssl-dev libace-6.* libace-dev libreadline-dev net-tools; RUN apt update && apt install -y libmysqlclient-dev libssl-dev libace-6.4.5 libace-dev libreadline-dev net-tools;
HEALTHCHECK --interval=5s --timeout=15s --start-period=30s --retries=3 CMD netstat -lnpt | grep :8085 || exit 1 HEALTHCHECK --interval=5s --timeout=15s --start-period=30s --retries=3 CMD netstat -lnpt | grep :8085 || exit 1

7
src/server/scripts/EasternKingdoms/zone_undercity.cpp
View File

@@ -2052,8 +2052,13 @@ public:
break; break;
case EVENT_AGGRO_JAINA: case EVENT_AGGRO_JAINA:
if (me->GetVictim()) if (me->GetVictim())
{
if (Creature *jaina = ObjectAccessor::GetCreature(*me, jainaGUID)) if (Creature *jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
jaina->AI()->AttackStart(me->GetVictim()); DoCast(me, SPELL_THUNDER); {
jaina->AI()->AttackStart(me->GetVictim());
}
}
DoCast(me, SPELL_THUNDER);
_events.ScheduleEvent(EVENT_AGGRO_JAINA, 2 * IN_MILLISECONDS); _events.ScheduleEvent(EVENT_AGGRO_JAINA, 2 * IN_MILLISECONDS);
break; break;
case EVENT_WRYNN_BUFF: case EVENT_WRYNN_BUFF:

3
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
View File

@@ -1077,8 +1077,9 @@ public:
break; break;
case EVENT_ARGENT_CHALLENGE_MOVE_FORWARD: case EVENT_ARGENT_CHALLENGE_MOVE_FORWARD:
{ {
if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID)) if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID)) {
boss->GetMotionMaster()->MovePoint(0, 746.881f, 635.263f, 411.7f); boss->GetMotionMaster()->MovePoint(0, 746.881f, 635.263f, 411.7f);
}
events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_ATTACK, 3000); events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_ATTACK, 3000);
events.PopEvent(); events.PopEvent();
} }