From 86bd915c59ddebef8980922410afc1736d3d031f Mon Sep 17 00:00:00 2001 From: Umeboshi Date: Fri, 10 Apr 2026 20:52:05 -0700 Subject: [PATCH] [core] Exclude mobs from Martial Arts calculations --- src/map/entities/battleentity.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/map/entities/battleentity.cpp b/src/map/entities/battleentity.cpp index 75f3efb0915..452ee356444 100644 --- a/src/map/entities/battleentity.cpp +++ b/src/map/entities/battleentity.cpp @@ -1,4 +1,4 @@ -/* +/* =========================================================================== Copyright (c) 2010-2015 Darkstar Dev Teams @@ -467,8 +467,9 @@ uint32 CBattleEntity::GetWeaponDelay(bool tp) float hasteMultiplier = 1.0f; float delayModMultiplier = 1.0f + getMod(Mod::DELAYP) / 100.0f; - // H2H - if (weapon->isHandToHand()) + // H2H (Mobs do not benefit from Martial Arts) + // TODO: Do Trusts benefit from Martial Arts? + if (weapon->isHandToHand() && objtype != TYPE_MOB) { martialArts = getMod(Mod::MARTIAL_ARTS) * 1000 / 60; // TODO: Job points? }