From aa20a33460af7dc91ecb26c134894f4476d1fd45 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Tue, 21 Jan 2025 19:32:39 -0500
Subject: [PATCH] v3.0.0: fixed smite's bonus damage triggering twice in most
 cases

---
 .../shatteredpixeldungeon/actors/hero/Hero.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index 377d12872..c68bb0165 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -1448,13 +1448,14 @@ public class Hero extends Char {
 
 		if (wep != null) {
 			damage = wep.proc( this, enemy, damage );
-		} else if (buff(HolyWeapon.HolyWepBuff.class) != null) {
-			int dmg = subClass == HeroSubClass.PALADIN ? 6 : 2;
-			enemy.damage(Math.round(dmg * Weapon.Enchantment.genericProcChanceMultiplier(this)), HolyWeapon.INSTANCE);
-		}
-
-		if (buff(Smite.SmiteTracker.class) != null){
-			enemy.damage(Smite.bonusDmg(this, enemy), Smite.INSTANCE);
+		} else {
+			if (buff(HolyWeapon.HolyWepBuff.class) != null) {
+				int dmg = subClass == HeroSubClass.PALADIN ? 6 : 2;
+				enemy.damage(Math.round(dmg * Weapon.Enchantment.genericProcChanceMultiplier(this)), HolyWeapon.INSTANCE);
+			}
+			if (buff(Smite.SmiteTracker.class) != null){
+				enemy.damage(Smite.bonusDmg(this, enemy), Smite.INSTANCE);
+			}
 		}
 		
 		switch (subClass) {