From 1cd8c43447c35cdb4394f7848513925c477ec776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Wed, 10 Nov 2021 10:18:40 +0100 Subject: [PATCH] fix(CI): revert sleep + fix shadowing variable issue (#9106) --- .github/workflows/pr_labeler.yml | 4 ---- src/server/game/Spells/Spell.cpp | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr_labeler.yml b/.github/workflows/pr_labeler.yml index b179c9abc..0c76a2520 100644 --- a/.github/workflows/pr_labeler.yml +++ b/.github/workflows/pr_labeler.yml @@ -6,10 +6,6 @@ jobs: triage: runs-on: ubuntu-20.04 steps: - # This delay is necessary to correctly trigger builds on label application - - name: Sleep for 30 seconds - run: sleep 30s - shell: bash - uses: actions/labeler@v3 with: repo-token: ${{ secrets.AC_GITHUB_TOKEN }} diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 3cbe852dd..30117b472 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1246,10 +1246,14 @@ void Spell::SelectImplicitConeTargets(SpellEffIndex effIndex, SpellImplicitTarge for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) { - if (Unit* unitTarget = (*itr)->ToUnit()) - AddUnitTarget(unitTarget, effMask, false); + if (Unit* unit = (*itr)->ToUnit()) + { + AddUnitTarget(unit, effMask, false); + } else if (GameObject* gObjTarget = (*itr)->ToGameObject()) + { AddGOTarget(gObjTarget, effMask); + } } } }