From 480086d85d547ca47e38ae3a5737801d35a9b66e Mon Sep 17 00:00:00 2001 From: Emagi Date: Fri, 8 Aug 2025 14:39:56 -0400 Subject: [PATCH] Fix allowing equipment during engagement based on the engaged_encounter info struct, not the engagedincombat (melee attack enabled flag) --- source/WorldServer/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/WorldServer/Player.cpp b/source/WorldServer/Player.cpp index 2476f17..e12f887 100644 --- a/source/WorldServer/Player.cpp +++ b/source/WorldServer/Player.cpp @@ -7908,7 +7908,7 @@ void Player::CalculatePlayerHPPower(int16 new_level) { bool Player::IsAllowedCombatEquip(int8 slot, bool send_message) { bool rule_pass = true; - if(EngagedInCombat() && rule_manager.GetZoneRule(GetZoneID(), R_Player, AllowPlayerEquipCombat)->GetInt8() == 0) { + if(GetInfoStruct()->get_engaged_encounter() && rule_manager.GetZoneRule(GetZoneID(), R_Player, AllowPlayerEquipCombat)->GetInt8() == 0) { switch(slot) { case EQ2_PRIMARY_SLOT: case EQ2_SECONDARY_SLOT: