Changed some checks for healing combat during bockhit (imbuements)

- Had a private reported bug about healing combat triggering imbuements, this should resolve that.
Black-Tek · Dec 22, 2024 · db26dac · db26dac
1 parent 6bca150
commit db26dac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/creature.cpp b/src/creature.cpp
@@ -870,7 +870,7 @@ BlockType_t Creature::blockHit(Creature* attacker, CombatType_t combatType, int3
 		}
 	}
 
-	if (attacker)
+	if (attacker && combatType != COMBAT_HEALING && blockType == BLOCK_NONE)
 	{
 		Player* attackerPlayer = attacker->getPlayer();
 		if (attackerPlayer) {
@@ -881,7 +881,7 @@ BlockType_t Creature::blockHit(Creature* attacker, CombatType_t combatType, int3
 					continue;
 				}
 
-				if (item->hasImbuements() && blockType == BLOCK_NONE) {
+				if (item->hasImbuements()) {
 
 					for (auto& imbuement : item->getImbuements()) {
 

diff --git a/src/player.cpp b/src/player.cpp
@@ -2662,7 +2662,7 @@ BlockType_t Player::blockHit(Creature* attacker, CombatType_t combatType, int32_
 				g_game.transformItem(item, item->getID(), charges - 1);
 			}
 
-			if (item->hasImbuements()) {
+			if (item->hasImbuements() && combatType != COMBAT_HEALING) {
 				for (auto imbuement : item->getImbuements()) {
 					switch (imbuement->imbuetype) {
 						case ImbuementType::IMBUEMENT_TYPE_FIRE_RESIST: