diff --git a/MultiServer.py b/MultiServer.py
index b305e01c..6be9ccfb 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -473,11 +473,8 @@ def send_new_items(ctx: Context):
 
 
 def forfeit_player(ctx: Context, team: int, slot: int):
-    all_locations = {values[0] for values in Regions.location_table.values() if type(values[0]) is int}
-    all_locations.update({values[1] for values in Regions.key_drop_data.values()})
-    all_locations.update({values for values in range(Regions.SHOP_ID_START, Regions.SHOP_ID_START + 256)})
-    # register any unknown locations, such as from future versions to be forfeited too
-    all_locations.update(location for location, location_slot in ctx.locations if location_slot == slot)
+    # register any locations that are in the multidata
+    all_locations = {location_id for location_id, location_slot in ctx.locations if location_slot == slot}
     ctx.notify_all("%s (Team #%d) has forfeited" % (ctx.player_names[(team, slot)], team + 1))
     register_location_checks(ctx, team, slot, all_locations)