Merge branch 'crabman/loot-protection-fix' into 'master'

Fix loot protection bugs

See merge request veloren/veloren!4437

CHANGELOG.md

@@ -27,9 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 ### Fixed
-- NPC path-finding, especially for merchants and travellers is now less dumb.
 
+- NPC path-finding, especially for merchants and travellers is now less dumb.
 - Moderate buff to wild large bipeds, to bring in line with other balancing
+- Loot protection for solo players and NPCs works again
 
 ## [0.16.0] - 2024-03-30
 

common/src/comp/group.rs

@@ -532,3 +532,9 @@ impl GroupManager {
         });
     }
 }
+
+impl Group {
+    /// Returns whether this is one of the special npc or enemy groups
+    // FIXME: These groups are a HACK
+    pub fn is_special(&self) -> bool { *self == NPC || *self == ENEMY }
+}

server/src/events/entity_manipulation.rs

@@ -592,13 +592,11 @@ impl ServerEvent for DestroyEvent {
 
                 false
             } else {
-                if let Some((_agent, uid, pos, alignment, vel, body)) = (
+                if let Some((_agent, pos, alignment, vel)) = (
                     &data.agents,
-                    &data.uids,
                     &data.positions,
                     data.alignments.maybe(),
                     data.velocities.maybe(),
-                    data.bodies.maybe(),
                 )
                     .lend_join()
                     .get(ev.entity, &data.entities)
@@ -614,16 +612,16 @@ impl ServerEvent for DestroyEvent {
                         // Remove entries where zero exp was awarded - this happens because some
                         // entities like Object bodies don't give EXP.
                         let mut item_receivers = HashMap::new();
-                        for (_entity, exp, group) in exp_awards {
+                        for (entity, exp, group) in exp_awards {
                             if exp >= f32::EPSILON {
                                 let loot_owner = if let Some(group) = group {
                                     Some(LootOwnerKind::Group(group))
                                 } else {
-                                    let uid = body.and_then(|body| {
+                                    let uid = data.bodies.get(entity).and_then(|body| {
                                         // Only humanoids are awarded loot ownership - if the winner
                                         // was a non-humanoid NPC the loot will be free-for-all
                                         if matches!(body, Body::Humanoid(_)) {
-                                            Some(*uid)
+                                            data.uids.get(entity).copied()
                                         } else {
                                             None
                                         }
@@ -655,12 +653,14 @@ impl ServerEvent for DestroyEvent {
                                     );
                                     Some(LootOwner::new(loot_owner, false))
                                 } else {
+                                    debug!("No loot owner");
                                     None
                                 },
                             })
                         };
 
                         if item_receivers.is_empty() {
+                            debug!("No item receivers");
                             for item in flatten_counted_items(&items, &data.ability_map, &data.msm)
                             {
                                 spawn_item(item, None)

server/src/sys/loot.rs

@@ -35,7 +35,11 @@ impl<'a> System<'a> for Sys {
                         LootOwnerKind::Player(uid) => id_maps
                             .uid_entity(uid)
                             .map_or(true, |entity| !entities.is_alive(entity)),
-                        LootOwnerKind::Group(group) => group_manager.group_info(group).is_none(),
+                        LootOwnerKind::Group(group) => {
+                            // Special alignment groups (NPC and ENEMY) aren't tracked by the group
+                            // manager, check them separately here
+                            !group.is_special() && group_manager.group_info(group).is_none()
+                        },
                     }
             })
             .map(|(entity, _)| entity)