From cc97572654f3ec25a16b0dd00e569ab4274bd06d Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 3 Dec 2017 19:21:35 +0100
Subject: [PATCH] friends are no longer crushed when Empathy should protect
 them

---
 game.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game.cpp b/game.cpp
index 50e5878b..a7df45f3 100644
--- a/game.cpp
+++ b/game.cpp
@@ -5876,7 +5876,7 @@ void placeGolem(cell *on, cell *moveto, eMonster m) {
     addMessage(XLAT("There is no room for %the1!", m));
     return;
     }
-  if(passable(on, moveto, m == moTameBomberbird ? P_FLYING : 0))
+  if(passable(on, moveto, P_ISFRIEND | (m == moTameBomberbird ? P_FLYING : 0)))
     on->monst = m;
   else {
     on->monst = m;