Skip to content

Fix: Killing the client will no longer save your items #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 19, 2025
Merged

Fix: Killing the client will no longer save your items #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e3ae45
alt-f4 is for timmys and rats, not chads like Chomp
cp89gamedev Aug 19, 2025
4940cab
Merge branch 'develop' into alt-f4-is-for-timmys
chompDev Aug 19, 2025
2676564
peer review fixes
cp89gamedev Aug 19, 2025
edbd31e
Merge branch 'alt-f4-is-for-timmys' of github.com:cp89gamedev/spt-ser…
cp89gamedev Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Libraries/SPTarkov.Server.Assets/SPT_Data/configs/lostondeath.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"SecuredContainer": false
},
"questItems": true,
"specialSlotItems": false
"specialSlotItems": false,
"wipeOnRaidStart": false
}
3 changes: 3 additions & 0 deletions Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ public record LostOnDeathConfig : BaseConfig
/// </summary>
[JsonPropertyName("questItems")]
public bool QuestItems { get; set; }

[JsonPropertyName("wipeOnRaidStart")]
public bool WipeOnRaidStart { get; set; }
}

public record LostEquipment
Expand Down
17 changes: 17 additions & 0 deletions Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ BtrDeliveryService btrDeliveryService
protected readonly RagfairConfig _ragfairConfig = configServer.GetConfig<RagfairConfig>();
protected readonly HideoutConfig _hideoutConfig = configServer.GetConfig<HideoutConfig>();
protected readonly PmcConfig _pmcConfig = configServer.GetConfig<PmcConfig>();
protected readonly LostOnDeathConfig _lostOnDeathConfig = configServer.GetConfig<LostOnDeathConfig>();

/// <summary>
/// Handle client/match/local/start
Expand Down Expand Up @@ -128,9 +129,25 @@ public virtual StartLocalRaidResponseData StartLocalRaid(MongoId sessionId, Star

GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);

// Handle Player Inventory Wiping checks for alt-f4 prevention
HandlePreRaidInventoryChecks(request.PlayerSide, playerProfile.CharacterData.PmcData, sessionId);

return result;
}

/// <summary>
/// Handle Pre Raid checks Alt-F4 Prevention and player inventory wiping
/// </summary>
protected void HandlePreRaidInventoryChecks(string playerSide, PmcData pmcData, string sessionId)
{
// If config enabled, remove players equipped items to prevent alt-F4 from persisting items
if (string.Equals(playerSide, "pmc", StringComparison.OrdinalIgnoreCase) && _lostOnDeathConfig.WipeOnRaidStart)
{
logger.Debug("Wiping player inventory on raid start to prevent alt-f4");
inRaidHelper.DeleteInventory(pmcData, sessionId);
}
}

/// <summary>
/// Replace map exits with scav exits when player is scavving
/// </summary>
Expand Down
Loading