From 578d3a166afef2f21b889330af76cbab8aff866a Mon Sep 17 00:00:00 2001 From: CWX Date: Fri, 24 Jan 2025 18:10:33 +0000 Subject: [PATCH] Change Prop to ColliderProps to not collide with another type --- Libraries/Core/Models/Eft/Common/LocationBase.cs | 4 ++-- Libraries/Core/Models/Spt/Mod/NewItemDetails.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/Core/Models/Eft/Common/LocationBase.cs b/Libraries/Core/Models/Eft/Common/LocationBase.cs index 8e78f493..663f65be 100644 --- a/Libraries/Core/Models/Eft/Common/LocationBase.cs +++ b/Libraries/Core/Models/Eft/Common/LocationBase.cs @@ -688,10 +688,10 @@ public record ColliderParams public string? Parent { get; set; } [JsonPropertyName("_props")] - public Props? Props { get; set; } + public ColliderProps? Props { get; set; } } -public record Props +public record ColliderProps { [JsonPropertyName("Center")] public XYZ? Center { get; set; } diff --git a/Libraries/Core/Models/Spt/Mod/NewItemDetails.cs b/Libraries/Core/Models/Spt/Mod/NewItemDetails.cs index fb976b80..94bb3e18 100644 --- a/Libraries/Core/Models/Spt/Mod/NewItemDetails.cs +++ b/Libraries/Core/Models/Spt/Mod/NewItemDetails.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables; -using Props = Core.Models.Eft.Common.Props; namespace Core.Models.Spt.Mod; @@ -16,7 +16,7 @@ public record NewItemFromCloneDetails : NewItemDetailsBase public string? ItemTplToClone { get; set; } [JsonPropertyName("overrideProperties")] - public Props? OverrideProperties { get; set; } + public ColliderProps? OverrideProperties { get; set; } [JsonPropertyName("parentId")] public string? ParentId { get; set; }