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

4
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -501,7 +501,7 @@ void Unit::UpdateSplineMovement(uint32 t_diff)
// pussywizard: update always! not every 400ms, because movement generators need the actual position // pussywizard: update always! not every 400ms, because movement generators need the actual position
//m_movesplineTimer.Update(t_diff); //m_movesplineTimer.Update(t_diff);
//if (m_movesplineTimer.Passed() || arrived) //if (m_movesplineTimer.Passed() || arrived)
UpdateSplinePosition(); UpdateSplinePosition();
} }
void Unit::UpdateSplinePosition() void Unit::UpdateSplinePosition()
@@ -15094,7 +15094,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
continue; continue;
// Some spells must always trigger // Some spells must always trigger
//if (isAlwaysTriggeredAura[aurEff->GetAuraType()]) //if (isAlwaysTriggeredAura[aurEff->GetAuraType()])
triggerData.effMask |= 1<<i; triggerData.effMask |= 1<<i;
} }
} }
if (triggerData.effMask) if (triggerData.effMask)

2
src/server/game/Handlers/QuestHandler.cpp
View File

@@ -91,7 +91,7 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recvData)
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
// Stop the npc if moving // Stop the npc if moving
//if (!creature->GetTransport()) // pussywizard: reverted with new spline (old: without this check, npc would stay in place and the transport would continue moving, so the npc falls off. NPCs on transports don't have waypoints, so stopmoving is not needed) //if (!creature->GetTransport()) // pussywizard: reverted with new spline (old: without this check, npc would stay in place and the transport would continue moving, so the npc falls off. NPCs on transports don't have waypoints, so stopmoving is not needed)
creature->StopMoving(); creature->StopMoving();
#ifdef ELUNA #ifdef ELUNA
if (sEluna->OnGossipHello(_player, creature)) if (sEluna->OnGossipHello(_player, creature))

2
src/server/game/Spells/SpellEffects.cpp
View File

@@ -2517,7 +2517,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
// xinef: i think this is wrong, found only 2 vehicles with faction override and one of them should inherit caster faction... // xinef: i think this is wrong, found only 2 vehicles with faction override and one of them should inherit caster faction...
//uint32 faction = properties->Faction; //uint32 faction = properties->Faction;
//if (!faction) //if (!faction)
uint32 faction = m_originalCaster->getFaction(); uint32 faction = m_originalCaster->getFaction();
summon->setFaction(faction); summon->setFaction(faction);
break; break;

4
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -1308,7 +1308,7 @@ public:
//if (team == ~uint32(0)) //if (team == ~uint32(0))
// handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id); // handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id);
//else //else
handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str()); handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str());
} }
return true; return true;
@@ -3067,7 +3067,7 @@ public:
group->SendUpdate(); group->SendUpdate();
} }
return true; return true;
} }
static bool HandleGroupDisbandCommand(ChatHandler* handler, char const* args) static bool HandleGroupDisbandCommand(ChatHandler* handler, char const* args)

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
View File

@@ -88,7 +88,7 @@ public:
//} //}
//else //else
//{ //{
HandOfThaurissan_Timer = 5000; HandOfThaurissan_Timer = 5000;
//Counter = 0; //Counter = 0;
//} //}
} else HandOfThaurissan_Timer -= diff; } else HandOfThaurissan_Timer -= diff;

9
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)) {
jaina->AI()->AttackStart(me->GetVictim()); DoCast(me, SPELL_THUNDER); if (Creature *jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
{
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:

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

@@ -1077,10 +1077,11 @@ 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.PopEvent(); events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_ATTACK, 3000);
events.PopEvent();
} }
break; break;
case EVENT_ARGENT_CHALLENGE_ATTACK: case EVENT_ARGENT_CHALLENGE_ATTACK:
@@ -1152,8 +1153,8 @@ public:
bk->ToCreature()->SetReactState(REACT_PASSIVE); bk->ToCreature()->SetReactState(REACT_PASSIVE);
} }
announcer->SetFacingToObject(bk_vehicle); announcer->SetFacingToObject(bk_vehicle);
announcer->AI()->Talk(TEXT_BK_RAFTERS); announcer->AI()->Talk(TEXT_BK_RAFTERS);
} }
events.PopEvent(); events.PopEvent();
} }

2
src/server/scripts/Outland/zone_blades_edge_mountains.cpp
View File

@@ -157,7 +157,7 @@ public:
me->SummonCreature(NPC_HOUND, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); me->SummonCreature(NPC_HOUND, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
else else
me->SummonCreature(NPC_FEL_IMP, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); me->SummonCreature(NPC_FEL_IMP, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
events.ScheduleEvent(EVENT_PARTY_TIMER, 3000); events.ScheduleEvent(EVENT_PARTY_TIMER, 3000);
break; break;
} }
} }

6
src/server/scripts/World/item_scripts.cpp
View File

@@ -48,15 +48,15 @@ public:
case 24538: case 24538:
if (player->GetAreaId() != 3628) if (player->GetAreaId() != 3628)
disabled = true; disabled = true;
break; break;
case 34489: case 34489:
if (player->GetZoneId() != 4080) if (player->GetZoneId() != 4080)
disabled = true; disabled = true;
break; break;
case 34475: case 34475:
if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES)) if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES))
Spell::SendCastResult(player, spellInfo, 1, SPELL_FAILED_NOT_ON_GROUND); Spell::SendCastResult(player, spellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
break; break;
} }
// allow use in flight only // allow use in flight only