From ab4f70b4482539e40dcfe7e5a9cf5f87c7e481d6 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Tue, 20 May 2025 19:59:25 +0300
Subject: [PATCH] Monsters were bashing with Snickersnee

Side effect of allowing Snickersnee to attack like a polearm,
monsters were bashing with it in melee.
---
 src/mhitm.c | 2 +-
 src/mhitu.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mhitm.c b/src/mhitm.c
index 1380148ed..8892c0f59 100644
--- a/src/mhitm.c
+++ b/src/mhitm.c
@@ -1273,7 +1273,7 @@ mswingsm(
     struct obj *otemp)  /* attacker's weapon */
 {
     if (flags.verbose && !Blind && mon_visible(magr)) {
-        boolean bash = (is_pole(otemp)
+        boolean bash = (is_pole(otemp) && !is_art(otemp, ART_SNICKERSNEE)
                         && (dist2(magr->mx, magr->my, mdef->mx, mdef->my)
                             <= 2));
 
diff --git a/src/mhitu.c b/src/mhitu.c
index 363c19cd4..ed0b6e098 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -872,6 +872,7 @@ mattacku(struct monst *mtmp)
                     mon_currwep = MON_WEP(mtmp);
                     if (mon_currwep) {
                         boolean bash = (is_pole(mon_currwep)
+                                        && !is_art(mon_currwep, ART_SNICKERSNEE)
                                         && m_next2u(mtmp));
 
                         hittmp = hitval(mon_currwep, &gy.youmonst);