aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/Spell.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-10-22 02:07:59 +0200
committerShauren <shauren.trinity@gmail.com>2022-10-22 02:07:59 +0200
commit1011cb73c92ddb90589452f70a1dd33830689e32 (patch)
tree02de42791042a43b54069787799e352afe8ec17d /src/server/game/Spells/Spell.cpp
parent29cfbedfb2af9ca6cf76c20b7e5fa17887418e8d (diff)
Core/GameObjects: Implemented gathering nodes (gameobject type 50)
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rw-r--r--src/server/game/Spells/Spell.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index fe7a1e12e06..b045b6473fd 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -6051,6 +6051,9 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32
lockId = go->GetGOInfo()->GetLockId();
if (!lockId)
return SPELL_FAILED_BAD_TARGETS;
+
+ if (go->GetGOInfo()->GetNotInCombat() && m_caster->ToUnit()->IsInCombat())
+ return SPELL_FAILED_AFFECTING_COMBAT;
}
else if (Item* itm = m_targets.GetItemTarget())
lockId = itm->GetTemplate()->GetLockID();