From f63f53400c202b714a0bddbec1d373ac95060d11 Mon Sep 17 00:00:00 2001
From: andrei <68240139+andrei8l@users.noreply.github.com>
Date: Thu, 10 Nov 2022 13:25:49 +0200
Subject: [PATCH] npc: allied NPCs aren't shopkeepers (#62146)

---
 src/npc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/npc.cpp b/src/npc.cpp
index 18f4e9d77f759..1032209a5fb55 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -2187,7 +2187,7 @@ void npc::shop_restock()
 
 bool npc::is_shopkeeper() const
 {
-    return !myclass->get_shopkeeper_items().empty();
+    return !is_player_ally() && !myclass->get_shopkeeper_items().empty();
 }
 
 int npc::minimum_item_value() const