From 4d2284cecbea5ba08cc94decd4d7bd5b259fb200 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 17 Aug 2024 15:19:32 -0300 Subject: [PATCH 01/13] fix(DB/Creature): High Nethermancer Zerevor taunt & interrupt immunity (#19646) --- data/sql/updates/pending_db_world/rev_1723822265566661700.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1723822265566661700.sql diff --git a/data/sql/updates/pending_db_world/rev_1723822265566661700.sql b/data/sql/updates/pending_db_world/rev_1723822265566661700.sql new file mode 100644 index 000000000..e1da308cb --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1723822265566661700.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256, `mechanic_immune_mask` = `mechanic_immune_mask`|33554432 WHERE `entry` = 22950; From 29f528cb4f61a9a0acd6afc279915492793ccf2a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Aug 2024 18:20:24 +0000 Subject: [PATCH 02/13] chore(DB): import pending files Referenced commit(s): 4d2284cecbea5ba08cc94decd4d7bd5b259fb200 --- .../rev_1723822265566661700.sql => db_world/2024_08_17_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1723822265566661700.sql => db_world/2024_08_17_00.sql} (77%) diff --git a/data/sql/updates/pending_db_world/rev_1723822265566661700.sql b/data/sql/updates/db_world/2024_08_17_00.sql similarity index 77% rename from data/sql/updates/pending_db_world/rev_1723822265566661700.sql rename to data/sql/updates/db_world/2024_08_17_00.sql index e1da308cb..3ecba4eb8 100644 --- a/data/sql/updates/pending_db_world/rev_1723822265566661700.sql +++ b/data/sql/updates/db_world/2024_08_17_00.sql @@ -1,2 +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; From 1c8576ff15769611b0ee07c6f7c41fe4efa204fa Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 17 Aug 2024 15:20:35 -0300 Subject: [PATCH 03/13] fix(DB/Creature): Gathios the Shatterer taunt immunity (#19639) --- data/sql/updates/pending_db_world/rev_1723769203579692900.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1723769203579692900.sql diff --git a/data/sql/updates/pending_db_world/rev_1723769203579692900.sql b/data/sql/updates/pending_db_world/rev_1723769203579692900.sql new file mode 100644 index 000000000..15662f5d5 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1723769203579692900.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256 WHERE `entry` = 22949; From 682c053416c2bb6eb949b8ecddb65bb9984e9823 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Aug 2024 18:21:17 +0000 Subject: [PATCH 04/13] chore(DB): import pending files Referenced commit(s): 29f528cb4f61a9a0acd6afc279915492793ccf2a --- .../rev_1723769203579692900.sql => db_world/2024_08_17_01.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1723769203579692900.sql => db_world/2024_08_17_01.sql} (67%) diff --git a/data/sql/updates/pending_db_world/rev_1723769203579692900.sql b/data/sql/updates/db_world/2024_08_17_01.sql similarity index 67% rename from data/sql/updates/pending_db_world/rev_1723769203579692900.sql rename to data/sql/updates/db_world/2024_08_17_01.sql index 15662f5d5..4549e1bf8 100644 --- a/data/sql/updates/pending_db_world/rev_1723769203579692900.sql +++ b/data/sql/updates/db_world/2024_08_17_01.sql @@ -1,2 +1,3 @@ +-- DB update 2024_08_17_00 -> 2024_08_17_01 -- UPDATE `creature_template` SET `flags_extra` = `flags_extra` |256 WHERE `entry` = 22949; From 50b7de64e3ecc9e58f04228c430d9c0343a37459 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 17 Aug 2024 15:21:55 -0300 Subject: [PATCH 05/13] fix(DB/Creature): Remove Veras Darkshadow stun immunity (#19642) fix(DB/Creature): Remove Veras stun immunity --- data/sql/updates/pending_db_world/rev_1723780227197753900.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1723780227197753900.sql diff --git a/data/sql/updates/pending_db_world/rev_1723780227197753900.sql b/data/sql/updates/pending_db_world/rev_1723780227197753900.sql new file mode 100644 index 000000000..a5559b45b --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1723780227197753900.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`&~2048 WHERE `entry` = 22952; From 6e3dba840edba68db6b558e7d83e4662c9eaadf6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Aug 2024 18:22:13 +0000 Subject: [PATCH 06/13] chore(DB): import pending files Referenced commit(s): 682c053416c2bb6eb949b8ecddb65bb9984e9823 --- .../rev_1723780227197753900.sql => db_world/2024_08_17_02.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1723780227197753900.sql => db_world/2024_08_17_02.sql} (71%) diff --git a/data/sql/updates/pending_db_world/rev_1723780227197753900.sql b/data/sql/updates/db_world/2024_08_17_02.sql similarity index 71% rename from data/sql/updates/pending_db_world/rev_1723780227197753900.sql rename to data/sql/updates/db_world/2024_08_17_02.sql index a5559b45b..aa01248aa 100644 --- a/data/sql/updates/pending_db_world/rev_1723780227197753900.sql +++ b/data/sql/updates/db_world/2024_08_17_02.sql @@ -1,2 +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; From a691ad3f4ddb43120a7be318352fc2789b5a47c4 Mon Sep 17 00:00:00 2001 From: Marcus Schommer Date: Sat, 17 Aug 2024 20:27:36 +0200 Subject: [PATCH 07/13] chore(APPS/installer): Detection of BSD* OS (#19285) Installer output is wrong for BSD*. "acore.sh install-deps" says "This platform is not supported" should be "BSD is not supported yet" --- apps/installer/includes/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/installer/includes/functions.sh b/apps/installer/includes/functions.sh index b9bdd9550..7e95f78fc 100644 --- a/apps/installer/includes/functions.sh +++ b/apps/installer/includes/functions.sh @@ -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 From adff3c3846b3f65a58dbb50a1cac188b7c8a888e Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Sat, 17 Aug 2024 19:29:21 -0400 Subject: [PATCH 08/13] fix(Core/Spells): Revert ownership and follow logic adjustment for guardian summons. (#19664) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "fix(Core/Spells): Adjust ownership and follow logic for guardian summ…" This reverts commit cc2ef9d6dd133c3855cb0ac4c4c61bbd768b1cdb. --- src/server/game/Spells/SpellEffects.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 0995d515f..9e1d22a08 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -5935,6 +5935,9 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const* if (!caster) return; + if (caster->IsTotem()) + caster = caster->ToTotem()->GetOwner(); + // in another case summon new uint8 summonLevel = caster->GetLevel(); @@ -6048,6 +6051,14 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const* //else if (summon->HasUnitTypeMask(UNIT_MASK_MINION) && m_targets.HasDst()) // ((Minion*)summon)->SetFollowAngle(m_caster->GetAngle(summon)); + // xinef: move this here, some auras are added in initstatsforlevel! + if (!summon->IsInCombat() && !summon->IsTrigger()) + { + // summon->AI()->EnterEvadeMode(); + summon->GetMotionMaster()->Clear(false); + summon->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, summon->GetFollowAngle(), MOTION_SLOT_ACTIVE); + } + if (properties && properties->Category == SUMMON_CATEGORY_ALLY) summon->SetFaction(caster->GetFaction()); From af1a6f3521b4925cf8151c647979817e2c043f18 Mon Sep 17 00:00:00 2001 From: Mike Delago <32778141+michaeldelago@users.noreply.github.com> Date: Sun, 18 Aug 2024 00:17:30 -0400 Subject: [PATCH 09/13] apps(docker): Fix Warnings in Dockerfile (#19537) --- apps/docker/Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/docker/Dockerfile b/apps/docker/Dockerfile index da2bcea15..e62b6b354 100644 --- a/apps/docker/Dockerfile +++ b/apps/docker/Dockerfile @@ -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 \ @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 # @@ -225,7 +225,7 @@ 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 # @@ -233,7 +233,7 @@ CMD bash -c "source /azerothcore/apps/installer/includes/functions.sh && inst_do FROM runtime AS tools -LABEL description "AzerothCore Tools" +LABEL description="AzerothCore Tools" WORKDIR /azerothcore/env/dist/ From adc9f4e7abe4ff29de806a3a8f20c7fd248fa661 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 18 Aug 2024 10:57:02 +0200 Subject: [PATCH 10/13] fix(Core/Spell): check for player before dereferencing (#19666) --- src/server/game/Spells/Spell.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 9bd266e11..ea4c3383e 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3739,8 +3739,9 @@ void Spell::cancel(bool bySelf) if (Unit* unit = m_caster->GetGUID() == ihit->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID)) unit->RemoveOwnedAura(m_spellInfo->Id, m_originalCasterGUID, 0, AURA_REMOVE_BY_CANCEL); - if (m_spellInfo->HasAttribute(SPELL_ATTR0_COOLDOWN_ON_EVENT)) - m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); + if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (m_spellInfo->HasAttribute(SPELL_ATTR0_COOLDOWN_ON_EVENT)) + m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); SendChannelUpdate(0); SendInterrupted(SPELL_FAILED_INTERRUPTED); From 167e06e287ef7ab54e85733f39e4c6a80e30c049 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sun, 18 Aug 2024 05:57:32 -0300 Subject: [PATCH 11/13] fix(Scripts/BlackTemple): Gathios Judgment spell should consume seals (#19640) --- src/server/scripts/Outland/BlackTemple/illidari_council.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 93e559147..eeff38ecc 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -659,13 +659,14 @@ class spell_illidari_council_judgement : public SpellScript void HandleScriptEffect(SpellEffIndex /*effIndex*/) { - Unit::AuraEffectList const& auras = GetCaster()->GetAuraEffectsByType(SPELL_AURA_DUMMY); - for (Unit::AuraEffectList::const_iterator i = auras.begin(); i != auras.end(); ++i) + auto const& auras = GetCaster()->GetAuraEffectsByType(SPELL_AURA_DUMMY); + for (auto i = auras.begin(); i != auras.end(); ++i) { if ((*i)->GetSpellInfo()->GetSpellSpecific() == SPELL_SPECIFIC_SEAL && (*i)->GetEffIndex() == EFFECT_2) if (sSpellMgr->GetSpellInfo((*i)->GetAmount())) { GetCaster()->CastSpell(GetHitUnit(), (*i)->GetAmount(), true); + GetCaster()->RemoveAurasDueToSpell((*i)->GetSpellInfo()->Id); break; } } From e33a56d89b25064af896427e678529a15565eb6e Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Sun, 18 Aug 2024 11:41:18 +0200 Subject: [PATCH 12/13] fix(Core/Creature): Nullcheck for questgreeting greeting (#19669) * fix(Core/Creature): Nullcheck for questgreeting greeting * closes https://github.com/azerothcore/azerothcore-wotlk/issues/19659 * Update GossipDef.cpp --- src/server/game/Entities/Creature/GossipDef.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index d85dbdfdb..0ec2ffa35 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -319,10 +319,16 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote const& eEmote, std::string const if (QuestGreeting const* questGreeting = sObjectMgr->GetQuestGreeting(guid.GetTypeId(), guid.GetEntry())) { - LocaleConstant locale = _session->GetSessionDbLocaleIndex(); - std::string strGreeting = questGreeting->Greeting[DEFAULT_LOCALE]; - if (questGreeting->Greeting.size() > size_t(locale) && !questGreeting->Greeting.empty()) - strGreeting = questGreeting->Greeting[locale]; + std::string strGreeting; + // Check if greeting exists. Blizzlike that some creatures have empty greeting + if (!questGreeting->Greeting.empty()) + { + LocaleConstant locale = _session->GetSessionDbLocaleIndex(); + if (questGreeting->Greeting.size() > size_t(locale)) + strGreeting = questGreeting->Greeting[locale]; + else + strGreeting = questGreeting->Greeting[DEFAULT_LOCALE]; + } data << strGreeting; data << uint32(questGreeting->EmoteDelay); From a0689fb4ef112f7bd74d8cc1e859a171d7ed2ce5 Mon Sep 17 00:00:00 2001 From: Grimdhex <176165533+Grimdhex@users.noreply.github.com> Date: Sun, 18 Aug 2024 13:39:06 +0200 Subject: [PATCH 13/13] fix(Dep/Boost): corrects a warning about path changes in boost process (#19629) --- src/common/Utilities/StartProcess.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/common/Utilities/StartProcess.cpp b/src/common/Utilities/StartProcess.cpp index a8b35578b..7f745d6ff 100644 --- a/src/common/Utilities/StartProcess.cpp +++ b/src/common/Utilities/StartProcess.cpp @@ -22,13 +22,7 @@ #include "Util.h" #include #include -#include -#include -#include -#include -#include -#include -#include +#include "boost/process.hpp" #include using namespace boost::process;