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-07 01:30:41 -0300
commitd20459f00efc1f70dae7e7dc8ac5756d8fef1323 (patch)
tree25f4c967b17724a9476f8d23254c530dc365b849 /src/server/game/AI
parent3674356c9e1f3cc97528f3e198b92b30688091a8 (diff)
Core/Creatures: disabled "automatic" monster sparring
- Faction template flags weren't correct. Closes #19245 (cherry picked from commit b2fc4c65eda779f880d9fc126d8b7aaef8c2ab25)
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 c7f118b9a50..86ebe8714d3 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);
}