[Fix] AllowFVNoDrop Flag trades (#4809)

This commit is contained in:
Mitch Freeman 2025-03-26 22:38:13 -03:00 committed by GitHub
parent 213fe6a9e9
commit 799609fb21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -906,26 +906,34 @@ bool EQ::ItemInstance::IsSlotAllowed(int16 slot_id) const {
bool EQ::ItemInstance::IsDroppable(bool recurse) const bool EQ::ItemInstance::IsDroppable(bool recurse) const
{ {
if (!m_item) if (!m_item) {
return false; return false;
}
/*if (m_ornamentidfile) // not implemented /*if (m_ornamentidfile) // not implemented
return false;*/ return false;*/
if (m_attuned) if (m_attuned) {
return false; return false;
/*if (m_item->FVNoDrop != 0) // not implemented }
return false;*/
if (m_item->NoDrop == 0) if (RuleI(World, FVNoDropFlag) == FVNoDropFlagRule::Enabled && m_item->FVNoDrop == 0) {
return true;
}
if (m_item->NoDrop == 0) {
return false; return false;
}
if (recurse) { if (recurse) {
for (auto iter : m_contents) { for (auto iter: m_contents) {
if (!iter.second) if (!iter.second) {
continue; continue;
}
if (!iter.second->IsDroppable(recurse)) if (!iter.second->IsDroppable(recurse)) {
return false; return false;
} }
} }
}
return true; return true;
} }