From 6fedf903808dea7b911139d577bac6b46e31f986 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 12 May 2021 00:25:07 +0200 Subject: [PATCH] Remove struct layout stuff It broke everything using the type --- TechbloxModdingAPI/Utility/NativeApiExtensions.cs | 1 - TechbloxModdingAPI/Utility/OptionalRef.cs | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/TechbloxModdingAPI/Utility/NativeApiExtensions.cs b/TechbloxModdingAPI/Utility/NativeApiExtensions.cs index 701e42f..adc9ee5 100644 --- a/TechbloxModdingAPI/Utility/NativeApiExtensions.cs +++ b/TechbloxModdingAPI/Utility/NativeApiExtensions.cs @@ -1,5 +1,4 @@ using Svelto.ECS; -using TechbloxModdingAPI.Blocks; namespace TechbloxModdingAPI.Utility { diff --git a/TechbloxModdingAPI/Utility/OptionalRef.cs b/TechbloxModdingAPI/Utility/OptionalRef.cs index c5cfb83..8bcbe28 100644 --- a/TechbloxModdingAPI/Utility/OptionalRef.cs +++ b/TechbloxModdingAPI/Utility/OptionalRef.cs @@ -5,14 +5,13 @@ using Svelto.ECS; namespace TechbloxModdingAPI.Utility { - [StructLayout(LayoutKind.Explicit)] //Make the array and managedArray fields take up the same space public ref struct OptionalRef where T : struct, IEntityComponent { - [FieldOffset(0)] private readonly State state; - [FieldOffset(1)] private readonly uint index; - [FieldOffset(5)] private NB array; - [FieldOffset(5)] private MB managedArray; - [FieldOffset(1)] private readonly EntityInitializer initializer; + private readonly State state; + private readonly uint index; + private NB array; + private MB managedArray; + private readonly EntityInitializer initializer; //The possible fields are: (index && (array || managedArray)) || initializer public OptionalRef(NB array, uint index)