Merge branch 'sharp/fix-silly-bug' into 'master'

Fix players being able to pick up other players.

See merge request veloren/veloren!2104
This commit is contained in:
Joshua Yanovski 2021-04-11 16:34:06 +00:00
commit dc4c02baad

View File

@ -149,7 +149,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
Err(returned_item) => { Err(returned_item) => {
// Inventory was full, so we need to put back the item (note that we know there // Inventory was full, so we need to put back the item (note that we know there
// was no old item component for this entity). // was no old item component for this entity).
item_storage.insert(entity, returned_item).expect( item_storage.insert(item_entity, returned_item).expect(
"We know item_entity exists since we just successfully removed its Item \ "We know item_entity exists since we just successfully removed its Item \
component.", component.",
); );