Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow bypassing loot protection with curious potion

Browse Source
This commit is contained in:
Maxicarlos08 2023-11-27 18:54:20 +01:00
parent 69e827dfda
commit 1cf733597d
No known key found for this signature in database
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/events/inventory_manip.rs
View File

@ -11,7 +11,7 @@ use common::{
item::{self, flatten_counted_items, tool::AbilityMap, MaterialStatManifest}, item::{self, flatten_counted_items, tool::AbilityMap, MaterialStatManifest},
loot_owner::LootOwnerKind, loot_owner::LootOwnerKind,
slot::{self, Slot}, slot::{self, Slot},
InventoryUpdate, LootOwner, InventoryUpdate, LootOwner, Stats,
}, },
consts::MAX_PICKUP_RANGE, consts::MAX_PICKUP_RANGE,
mounting::VolumePos, mounting::VolumePos,
@ -152,13 +152,19 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
.map_or(true, |loot_owner| { .map_or(true, |loot_owner| {
let alignments = state.ecs().read_storage::<Alignment>(); let alignments = state.ecs().read_storage::<Alignment>();
let bodies = state.ecs().read_storage::<Body>(); let bodies = state.ecs().read_storage::<Body>();
let stats = state.ecs().read_storage::<Stats>();
let players = state.ecs().read_storage::<Player>(); let players = state.ecs().read_storage::<Player>();
let groups = state.ecs().read_storage::<Group>(); let groups = state.ecs().read_storage::<Group>();
let can_pickup = loot_owner.can_pickup( let can_pickup = loot_owner.can_pickup(
uid, uid,
groups.get(entity), groups.get(entity),
alignments.get(entity), alignments.get(entity),
bodies.get(entity), // The body of an entity can be changed using a buff with the ChangeBody
// effect, attempt using the original body from stats if available
stats
.get(entity)
.map(|stats| &stats.original_body)
.or_else(|| bodies.get(entity)),
players.get(entity), players.get(entity),
); );
if !can_pickup { if !can_pickup {