aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/AI
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-03-06 19:11:03 -0300
committerariel- <ariel-@users.noreply.github.com>2017-03-06 19:11:03 -0300
commitb2fc4c65eda779f880d9fc126d8b7aaef8c2ab25 (patch)
tree7e9a98a5c6329f84af51c4270ffe5c07eb952573 /src/server/game/AI
parentfb58e3f1b55260f79b78d9b27400d85c9d447703 (diff)
Core/Creatures: disabled "automatic" monster sparring
- Faction template flags weren't correct. Closes #19245
Diffstat (limited to 'src/server/game/AI')
-rw-r--r--src/server/game/AI/CoreAI/UnitAI.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp
index 69d4cc4c65d..4f0c05429d5 100644
--- a/src/server/game/AI/CoreAI/UnitAI.cpp
+++ b/src/server/game/AI/CoreAI/UnitAI.cpp
@@ -56,24 +56,17 @@ void UnitAI::DoMeleeAttackIfReady()
if (!me->IsWithinMeleeRange(victim))
return;
- bool sparAttack = me->GetFactionTemplateEntry()->ShouldSparAttack() && victim->GetFactionTemplateEntry()->ShouldSparAttack();
//Make sure our attack is ready and we aren't currently casting before checking distance
if (me->isAttackReady())
{
- if (sparAttack)
- me->FakeAttackerStateUpdate(victim);
- else
- me->AttackerStateUpdate(victim);
+ me->AttackerStateUpdate(victim);
me->resetAttackTimer();
}
if (me->haveOffhandWeapon() && me->isAttackReady(OFF_ATTACK))
{
- if (sparAttack)
- me->FakeAttackerStateUpdate(victim, OFF_ATTACK);
- else
- me->AttackerStateUpdate(victim, OFF_ATTACK);
+ me->AttackerStateUpdate(victim, OFF_ATTACK);
me->resetAttackTimer(OFF_ATTACK);
}