From c4f05c3864de6ecf24d92f32f1964d7b4a34b2e3 Mon Sep 17 00:00:00 2001
From: Paul Coene <noudess@gmail.com>
Date: Mon, 2 May 2022 23:08:08 -0400
Subject: [PATCH] [Combat] Fix Frenzy vs opponents immune to non-magic (#2095)

* [Combat] Fix Frenzy vs opponents immune to non-magic

* Fix naming.

* Use snake case for variable
---
 zone/special_attacks.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp
index 3fac88c15..fac6e0ab3 100644
--- a/zone/special_attacks.cpp
+++ b/zone/special_attacks.cpp
@@ -340,6 +340,11 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk)
 		ReuseTime = FrenzyReuseTime - 1 - skill_reduction;
 		ReuseTime = (ReuseTime * HasteMod) / 100;
 
+		auto primary_in_use = GetInv().GetItem(EQ::invslot::slotPrimary);
+		if (primary_in_use && GetWeaponDamage(GetTarget(), primary_in_use) <= 0) {
+			max_dmg = DMG_INVULNERABLE;
+		}
+
 		while (AtkRounds > 0) {
 			if (GetTarget())
 				DoSpecialAttackDamage(GetTarget(), EQ::skills::SkillFrenzy, max_dmg, 0, max_dmg, ReuseTime);