Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-12-12 11:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow dupe powerup pickups

Browse Source
This commit is contained in:
David Markowitz
2025-10-13 20:26:00 -07:00
parent 28c6bfcbd7
commit 409053e7af
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dGame/Entity.cpp
View File

@@ -1668,7 +1668,7 @@ void Entity::AddLootItem(const Loot::Info& info) const {
auto* const characterComponent = GetComponent<CharacterComponent>(); auto* const characterComponent = GetComponent<CharacterComponent>();
if (!characterComponent) return; if (!characterComponent) return;
LOG("Player %llu has been allowed to pickup %i with id %llu", m_ObjectID, info.lot, info.id);
auto& droppedLoot = characterComponent->GetDroppedLoot(); auto& droppedLoot = characterComponent->GetDroppedLoot();
droppedLoot[info.id] = info; droppedLoot[info.id] = info;
} }
@@ -2337,6 +2337,14 @@ bool Entity::MsgPickupItem(GameMessages::GameMsg& msg) {
auto* const characterComponent = GetComponent<CharacterComponent>(); auto* const characterComponent = GetComponent<CharacterComponent>();
if (!characterComponent) return false; if (!characterComponent) return false;
auto& droppedLoot = characterComponent->GetDroppedLoot(); auto& droppedLoot = characterComponent->GetDroppedLoot();
const auto it = droppedLoot.find(pickupItemMsg.lootID);
if (it != droppedLoot.end()) {
CDObjectsTable* objectsTable = CDClientManager::GetTable<CDObjectsTable>();
const CDObjects& object = objectsTable->GetByID(it->second.lot);
if (object.id != 0 && object.type == "Powerup") {
return false; // Let powerups be duplicated
}
}
droppedLoot.erase(pickupItemMsg.lootID); droppedLoot.erase(pickupItemMsg.lootID);
} }