aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKelno <kelno@users.noreply.github.com>2020-01-14 21:16:23 +0100
committerShauren <shauren.trinity@gmail.com>2021-12-20 21:25:46 +0100
commit45585b53053b215a4ab225b8c803f6fc6616eb74 (patch)
treee6bae5647806cdbd1f0d670356c30c1965558281 /src
parentaa81d8979f72ad093e8bf7ef0966852236a717d5 (diff)
Fixed PvP Combat timer never getting refreshed (#24058)
* Fixed PvP Combat timer never gets refreshed while meleeing * Apply Treeston feedback Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com> (cherry picked from commit 2b024e8fbff24b071217cd88f052fdeaa48b47ba)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index ca3c5797e6d..1f0168b560c 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7661,9 +7661,6 @@ void Unit::EngageWithTarget(Unit* enemy)
if (!enemy)
return;
- if (IsEngagedBy(enemy))
- return;
-
if (CanHaveThreatList())
m_threatManager.AddThreat(enemy, 0.0f, nullptr, true, true);
else