fix: apply global attack multiplier only for players

omarcopires · Dec 5, 2024 · d7c7bac · d7c7bac
1 parent d52ffa6
commit d7c7bac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/config.lua.dist b/config.lua.dist
@@ -506,7 +506,7 @@ rateSpellCooldown = 1.0
 rateAttackSpeed = 1.0
 rateOfflineTrainingSpeed = rateAttackSpeed
 rateExerciseTrainingSpeed = rateAttackSpeed
-ratePlayerAttack = 1
+ratePlayerAttack = 1.0
 
 -- Monster rates
 rateMonsterHealth = 1.0

diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp
@@ -2280,10 +2280,11 @@ void Combat::applyExtensions(const std::shared_ptr<Creature> &caster, const std:
 		damage.secondary.value *= monster->getAttackMultiplier();
 	}
 
-	const double globalMultiplier = g_configManager().getFloat(RATE_PLAYER_ATTACK);
-
-	damage.primary.value = static_cast<int32_t>(damage.primary.value * globalMultiplier);
-	damage.secondary.value = static_cast<int32_t>(damage.secondary.value * globalMultiplier);
+	if (player) {
+		const double globalMultiplier = g_configManager().getFloat(RATE_PLAYER_ATTACK);
+		damage.primary.value = static_cast<int32_t>(damage.primary.value * globalMultiplier);
+		damage.secondary.value = static_cast<int32_t>(damage.secondary.value * globalMultiplier);
+	}
 }
 
 MagicField::MagicField(uint16_t type) :