From: Pasi Kallinen <paxed@alt.org>
Date: Tue, 18 Oct 2016 15:07:53 +0000 (+0300)
Subject: Wielding Demonbane prevents demons summoning friends
X-Git-Tag: NetHack-3.6.1_RC01~561
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f106b578a25b49e6d4de8dcde72347af0324caa6;p=nethack

Wielding Demonbane prevents demons summoning friends
---

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index b997f6994..bb74b1308 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -352,6 +352,7 @@ sometimes generate the random mazes with wide corridors, thick walls,
 	or with dead ends changed to loops
 put throne room gold in the chest
 wielding Trollsbane prevents trolls from reviving
+wielding Demonbane prevents demons summoning friends
 
 
 Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
diff --git a/src/minion.c b/src/minion.c
index 1af08f5ea..d0394477b 100644
--- a/src/minion.c
+++ b/src/minion.c
@@ -57,6 +57,13 @@ struct monst *mon;
 
     if (mon) {
         ptr = mon->data;
+
+        if (uwep && uwep->oartifact == ART_DEMONBANE && is_demon(ptr)) {
+            if (canseemon(mon))
+                pline("%s looks puzzled for a moment.", Monnam(mon));
+            return 0;
+        }
+
         atyp = mon->ispriest ? EPRI(mon)->shralign
                              : mon->isminion ? EMIN(mon)->min_align
                                              : (ptr->maligntyp == A_NONE)