From 3624b9e30b90972da43f5e0330a7409631e305c3 Mon Sep 17 00:00:00 2001 From: Daniel Davies Date: Tue, 5 May 2020 13:55:34 +0100 Subject: [PATCH] Set player in/out of combat when updating the hate list. --- src/world/Actor/Player.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index 07b12743..61d869ea 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -1417,6 +1417,8 @@ void Sapphire::Entity::Player::hateListAdd( BNpcPtr pBNpc ) m_actorIdTohateSlotMap[ pBNpc->getId() ] = hateId; sendHateList(); } + + setInCombat(true); } void Sapphire::Entity::Player::hateListRemove( BNpcPtr pBNpc ) @@ -1431,6 +1433,7 @@ void Sapphire::Entity::Player::hateListRemove( BNpcPtr pBNpc ) m_freeHateSlotQueue.push( hateSlot ); m_actorIdTohateSlotMap.erase( it ); sendHateList(); + setInCombat( !m_actorIdTohateSlotMap.empty() ); return; }