Override Player::removeAttackedCreature

otland · Nov 5, 2024 · 14da3bc · 14da3bc
1 parent dc2b817
commit 14da3bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git 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
@@ -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;