From 14da3bcff58aa5ccaca065fd867dfd05ef5be766 Mon Sep 17 00:00:00 2001
From: ramon-bernardo <ramonbernardo.contato@gmail.com>
Date: Mon, 4 Nov 2024 22:29:04 -0300
Subject: [PATCH] Override Player::removeAttackedCreature

---
 src/player.cpp | 9 +++++++++
 src/player.h   | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/player.cpp b/src/player.cpp
index 57aa9de9e9..a3c7f190dd 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -3354,6 +3354,15 @@ void Player::setAttackedCreature(Creature* creature)
 	g_dispatcher.addTask([id = getID()]() { g_game.checkCreatureAttack(id); });
 }
 
+void Player::removeAttackedCreature()
+{
+	Creature::removeAttackedCreature();
+
+	if (followCreature) {
+		setFollowCreature(nullptr);
+	}
+}
+
 void Player::goToFollowCreature()
 {
 	if (!walkTask) {
diff --git a/src/player.h b/src/player.h
index aaba259217..446c8cb061 100644
--- a/src/player.h
+++ b/src/player.h
@@ -429,6 +429,7 @@ class Player final : public Creature, public Cylinder
 
 	// combat functions
 	void setAttackedCreature(Creature* creature) override;
+	void removeAttackedCreature() override;
 	bool isImmune(CombatType_t type) const override;
 	bool isImmune(ConditionType_t type) const override;
 	bool hasShield() const;