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

2025-01-14 19:30:28 +00:00
parent 8c401cfd1f 2dee26a47c
commit 5f0040ebed
2 changed files with 9 additions and 17 deletions
@@ -109,11 +109,17 @@ public class UpdMap

 public class MapMarker
 {
+    [JsonPropertyName("Type")]
+    public string? Type { get; set; }
+
    [JsonPropertyName("X")]
-    public int? X { get; set; }
+    public double? X { get; set; }

    [JsonPropertyName("Y")]
-    public int? Y { get; set; }
+    public double? Y { get; set; }
+
+    [JsonPropertyName("Note")]
+    public string? Note { get; set; }
 }

 public class UpdTag
@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using Core.Models.Eft.Common.Tables;

 namespace Core.Models.Eft.Inventory;

@@ -13,18 +14,3 @@ public class InventoryCreateMarkerRequestData : InventoryBaseActionRequestData
    [JsonPropertyName("mapMarker")]
    public MapMarker? MapMarker { get; set; }
 }
-
-public class MapMarker
-{
-    [JsonPropertyName("Type")]
-    public string? Type { get; set; }
-
-    [JsonPropertyName("X")]
-    public double? X { get; set; }
-
-    [JsonPropertyName("Y")]
-    public double? Y { get; set; }
-
-    [JsonPropertyName("Note")]
-    public string? Note { get; set; }
-}