fix #360

mehah · Dec 13, 2022 · e84ff12 · e84ff12
1 parent cbeca18
commit e84ff12
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/client/creature.cpp b/src/client/creature.cpp
@@ -467,6 +467,11 @@ void Creature::onDisappear()
 
         self->m_oldPosition = {};
         self->m_disappearEvent = nullptr;
+
+        if (g_game.getAttackingCreature() == self)
+            g_game.cancelAttack();
+        else if (g_game.getFollowingCreature() == self)
+            g_game.cancelFollow();
         });
 }