From 828516296708c7dcac822d5dc5b4c6f45d6cd13a Mon Sep 17 00:00:00 2001
From: crabman <vlrncrabman+veloren@gmail.com>
Date: Mon, 12 Feb 2024 23:34:00 +0100
Subject: [PATCH] Fix a few cases where return was incorectly used in event
 systems

---
 server/src/events/group_manip.rs     |  8 ++++----
 server/src/events/inventory_manip.rs | 10 +++++-----
 server/src/events/invite.rs          | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/server/src/events/group_manip.rs b/server/src/events/group_manip.rs
index acf79b1176..8c09c32293 100644
--- a/server/src/events/group_manip.rs
+++ b/server/src/events/group_manip.rs
@@ -159,7 +159,7 @@ impl ServerEvent for GroupManipEvent {
                                     "Kick failed, target does not exist.",
                                 ));
                             }
-                            return;
+                            continue;
                         },
                     };
 
@@ -172,7 +172,7 @@ impl ServerEvent for GroupManipEvent {
                                 "Kick failed, you can't kick pets.",
                             ));
                         }
-                        return;
+                        continue;
                     }
                     // Can't kick yourself
                     if uids.get(entity).map_or(false, |u| *u == uid) {
@@ -182,7 +182,7 @@ impl ServerEvent for GroupManipEvent {
                                 "Kick failed, you can't kick yourself.",
                             ));
                         }
-                        return;
+                        continue;
                     }
 
                     // Make sure kicker is the group leader
@@ -264,7 +264,7 @@ impl ServerEvent for GroupManipEvent {
                                     "Leadership transfer failed, target does not exist",
                                 ));
                             }
-                            return;
+                            continue;
                         },
                     };
                     // Make sure assigner is the group leader
diff --git a/server/src/events/inventory_manip.rs b/server/src/events/inventory_manip.rs
index fbfc025e1e..d9f7b53734 100644
--- a/server/src/events/inventory_manip.rs
+++ b/server/src/events/inventory_manip.rs
@@ -167,7 +167,7 @@ impl ServerEvent for InventoryManipEvent {
                         // of the world from the first pickup
                         // attempt was processed.
                         debug!("Failed to get entity for item Uid: {}", pickup_uid);
-                        return;
+                        continue;
                     };
                     let entity_cylinder = get_cylinder(entity);
 
@@ -177,7 +177,7 @@ impl ServerEvent for InventoryManipEvent {
                             ?entity_cylinder,
                             "Failed to pick up item as not within range, Uid: {}", pickup_uid
                         );
-                        return;
+                        continue;
                     }
 
                     // If there's a loot owner for the item being picked up, then
@@ -214,7 +214,7 @@ impl ServerEvent for InventoryManipEvent {
                             });
 
                     if !ownership_check_passed {
-                        return;
+                        continue;
                     }
 
                     // First, we remove the item, assuming picking it up will succeed (we do this to
@@ -231,7 +231,7 @@ impl ServerEvent for InventoryManipEvent {
                             "Failed to delete item component for entity, Uid: {}",
                             pickup_uid
                         );
-                        return;
+                        continue;
                     };
 
                     // NOTE: We dup the item for message purposes.
@@ -702,7 +702,7 @@ impl ServerEvent for InventoryManipEvent {
                         if let Some(source_item) = inventory.get(source_inv_slot_id) {
                             if let Some(target_item) = inventory.get(target_inv_slot_id) {
                                 if source_item != target_item {
-                                    return;
+                                    continue;
                                 }
                             }
                         }
diff --git a/server/src/events/invite.rs b/server/src/events/invite.rs
index c8c7101d6b..b27e3c5d0b 100644
--- a/server/src/events/invite.rs
+++ b/server/src/events/invite.rs
@@ -78,7 +78,7 @@ impl ServerEvent for InitiateInviteEvent {
                             "Invite failed, target does not exist.",
                         ));
                     }
-                    return;
+                    continue;
                 },
             };
 
@@ -88,13 +88,13 @@ impl ServerEvent for InitiateInviteEvent {
                 .map_or(false, |inviter_uid| *inviter_uid == invitee_uid)
             {
                 warn!("Entity tried to invite themselves into a group/trade");
-                return;
+                continue;
             }
 
             if matches!(kind, InviteKind::Trade) {
                 // Check whether the inviter is in range of the invitee
                 if !within_trading_range(positions.get(inviter), positions.get(invitee)) {
-                    return;
+                    continue;
                 }
             }
 
@@ -108,7 +108,7 @@ impl ServerEvent for InitiateInviteEvent {
                     inviter,
                     invitee,
                 ) {
-                    return;
+                    continue;
                 }
             } else {
                 // cancel current trades for inviter before inviting someone else to trade
@@ -141,7 +141,7 @@ impl ServerEvent for InitiateInviteEvent {
                         "This player already has a pending invite.",
                     ));
                 }
-                return;
+                continue;
             }
 
             let mut invite_sent = false;