EQ2/Emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix allowing equipment during engagement based on the engaged_encounter info struct, not the engagedincombat (melee attack enabled flag)

Browse Source
This commit is contained in:
Emagi 2025-08-08 14:39:56 -04:00
parent 25325477ab
commit 480086d85d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/WorldServer/Player.cpp
View File

@ -7908,7 +7908,7 @@ void Player::CalculatePlayerHPPower(int16 new_level) {
bool Player::IsAllowedCombatEquip(int8 slot, bool send_message) { bool Player::IsAllowedCombatEquip(int8 slot, bool send_message) {
bool rule_pass = true; 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) { switch(slot) {
case EQ2_PRIMARY_SLOT: case EQ2_PRIMARY_SLOT:
case EQ2_SECONDARY_SLOT: case EQ2_SECONDARY_SLOT: