chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/sp-tarkov/server-csharp into develop

Browse Source
This commit is contained in:
Chomp
2025-10-11 10:08:34 +01:00
parent e813357a60 2576a163e3
commit 7403990e69
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs
+1 -2
View File
@@ -1,7 +1,6 @@
using System.Text.Json.Serialization;
using SPTarkov.Server.Core.Models.Eft.Common.Tables;
using SPTarkov.Server.Core.Models.Utils;
using Mastering = SPTarkov.Server.Core.Models.Eft.Common.Mastering;
namespace SPTarkov.Server.Core.Models.Eft.Health;
@@ -17,7 +16,7 @@ public record WorkoutSkills
public List<CommonSkill> Common { get; set; }
[JsonPropertyName("Mastering")]
public List<Mastering>? Mastering { get; set; }
public List<MasterySkill>? Mastering { get; set; }
[JsonPropertyName("Bonuses")]
public Bonus? Bonuses { get; set; }
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
+3
View File
@@ -17,6 +17,9 @@ public record HandleQTEEventRequestData : InventoryBaseActionRequestData
[JsonPropertyName("id")]
public string? Id { get; set; }
[JsonPropertyName("aid")]
public string? Aid { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp { get; set; }
}