* Fixed a bug with some base piece types not having their guid copied when base geometry is being recalculated.

Sunrunner37 · Sunrunner37 · commit c0cb780eb458 · 2019-01-13T01:08:42.000+01:00
* When completing a base piece's construction try to create the base (using the parent id) if it does not exist.
diff --git a/NitroxClient/Communication/Packets/Processors/ConstructionCompletedProcessor.cs b/NitroxClient/Communication/Packets/Processors/ConstructionCompletedProcessor.cs
@@ -16,8 +16,8 @@ public ConstructionCompletedProcessor(BuildThrottlingQueue buildEventQueue)
 
         public override void Process(ConstructionCompleted completedPacket)
         {
-            Log.Debug("Processing ConstructionCompleted " + completedPacket.Guid + " " + completedPacket.NewBaseCreatedGuid);
-            buildEventQueue.EnqueueConstructionCompleted(completedPacket.Guid, completedPacket.NewBaseCreatedGuid);
+            Log.Debug("Processing ConstructionCompleted " + completedPacket.Guid + " " + completedPacket.BaseGuid);
+            buildEventQueue.EnqueueConstructionCompleted(completedPacket.Guid, completedPacket.BaseGuid);
         }
     }
 }
diff --git a/NitroxClient/Communication/Packets/Processors/InitialPlayerSyncProcessor.cs b/NitroxClient/Communication/Packets/Processors/InitialPlayerSyncProcessor.cs
@@ -216,8 +216,8 @@ private void SpawnBasePieces(List<BasePiece> basePieces)
                     buildEventQueue.EnqueueBasePiecePlaced(basePiece);
 
                     if (basePiece.ConstructionCompleted)
-                    {
-                        buildEventQueue.EnqueueConstructionCompleted(basePiece.Guid, basePiece.NewBaseGuid);
+                    {                        
+                        buildEventQueue.EnqueueConstructionCompleted(basePiece.Guid, basePiece.BaseGuid);
                     }
                     else
                     {
diff --git a/NitroxClient/GameLogic/Bases/BuildThrottlingQueue.cs b/NitroxClient/GameLogic/Bases/BuildThrottlingQueue.cs
@@ -32,10 +32,10 @@ public void EnqueueBasePiecePlaced(BasePiece basePiece)
             Enqueue(new BasePiecePlacedEvent(basePiece));
         }
 
-        public void EnqueueConstructionCompleted(string guid, Optional<string> newBaseCreatedGuid)
+        public void EnqueueConstructionCompleted(string guid, string baseGuid)
         {
             Log.Info("Enqueuing item to have construction completed " + guid);
-            Enqueue(new ConstructionCompletedEvent(guid, newBaseCreatedGuid));
+            Enqueue(new ConstructionCompletedEvent(guid, baseGuid));
         }
 
         public void EnqueueAmountChanged(string guid, float amount)
@@ -97,12 +97,12 @@ public bool RequiresFreshFrame()
     public class ConstructionCompletedEvent : BuildEvent
     {
         public string Guid { get; }
-        public Optional<string> NewBaseCreatedGuid { get; }
+        public string BaseGuid { get; }
 
-        public ConstructionCompletedEvent(string guid, Optional<string> newBaseCreatedGuid)
+        public ConstructionCompletedEvent(string guid, string baseGuid)
         {
             Guid = guid;
-            NewBaseCreatedGuid = newBaseCreatedGuid;
+            BaseGuid = baseGuid;
         }
 
         public bool RequiresFreshFrame()
diff --git a/NitroxClient/GameLogic/Building.cs b/NitroxClient/GameLogic/Building.cs
@@ -1,5 +1,6 @@
 ﻿using NitroxClient.Communication.Abstract;
 using NitroxClient.GameLogic.Helper;
+using NitroxClient.GameLogic.Spawning;
 using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures.GameLogic;
 using NitroxModel.DataStructures.GameLogic.Buildings.Rotation;
@@ -87,17 +88,17 @@ public void ChangeConstructionAmount(GameObject gameObject, float amount)
 
         public void ConstructionComplete(GameObject ghost)
         {
-            Optional<string> newlyConstructedBaseGuid = Optional<string>.Empty();
+            string baseGuid = null;
             Optional<object> opConstructedBase = TransientLocalObjectManager.Get(TransientObjectType.BASE_GHOST_NEWLY_CONSTRUCTED_BASE_GAMEOBJECT);
 
             string guid = GuidHelper.GetGuid(ghost);
 
             if (opConstructedBase.IsPresent())
             {
                 GameObject constructedBase = (GameObject)opConstructedBase.Get();
-                newlyConstructedBaseGuid = Optional<string>.Of(GuidHelper.GetGuid(constructedBase));
+                baseGuid = GuidHelper.GetGuid(constructedBase);
             }
-
+            
             // For base pieces, we must switch the guid from the ghost to the newly constructed piece.
             // Furniture just uses the same game object as the ghost for the final product.
             if(ghost.GetComponent<ConstructableBase>() != null)
@@ -107,9 +108,14 @@ public void ConstructionComplete(GameObject ghost)
                 
                 UnityEngine.Object.Destroy(ghost);
                 GuidHelper.SetNewGuid(finishedPiece, guid);
+
+                if(baseGuid == null)
+                {
+                    baseGuid = GuidHelper.GetGuid(finishedPiece.GetComponentInParent<Base>().gameObject);
+                }
             }
-            
-            ConstructionCompleted constructionCompleted = new ConstructionCompleted(guid, newlyConstructedBaseGuid);
+
+            ConstructionCompleted constructionCompleted = new ConstructionCompleted(guid, baseGuid);
             packetSender.Send(constructionCompleted);
         }
 
diff --git a/NitroxClient/MonoBehaviours/ThrottledBuilder.cs b/NitroxClient/MonoBehaviours/ThrottledBuilder.cs
@@ -108,6 +108,7 @@ private void ActionBuildEvent(BuildEvent buildEvent)
 
         private void BuildBasePiece(BasePiecePlacedEvent basePiecePlacedBuildEvent)
         {
+            Log.Info("BuildBasePiece " + basePiecePlacedBuildEvent.BasePiece.Guid + " " + basePiecePlacedBuildEvent.BasePiece.TechType);
             BasePiece basePiece = basePiecePlacedBuildEvent.BasePiece;
             GameObject buildPrefab = CraftData.GetBuildPrefab(basePiece.TechType);
             MultiplayerBuilder.overridePosition = basePiece.ItemPosition;
@@ -124,7 +125,7 @@ private void BuildBasePiece(BasePiecePlacedEvent basePiecePlacedBuildEvent)
             
             if(basePiece.ParentGuid.IsPresent())
             {
-                parentBase = GuidHelper.RequireObjectFrom(basePiece.ParentGuid.Get());
+                parentBase = GuidHelper.GetObjectFrom(basePiece.ParentGuid.Get()).OrElse(null);
             }
             
             Constructable constructable;
@@ -155,6 +156,7 @@ private void BuildBasePiece(BasePiecePlacedEvent basePiecePlacedBuildEvent)
 
         private void ConstructionCompleted(ConstructionCompletedEvent constructionCompleted)
         {
+            Log.Info("Constructed completed " + constructionCompleted.Guid);
             GameObject constructing = GuidHelper.RequireObjectFrom(constructionCompleted.Guid);
 
             ConstructableBase constructableBase = constructing.GetComponent<ConstructableBase>();
@@ -176,12 +178,12 @@ private void ConstructionCompleted(ConstructionCompletedEvent constructionComple
                 Constructable constructable = constructing.GetComponent<Constructable>();
                 constructable.constructedAmount = 1f;
                 constructable.SetState(true, true);
-            }           
+            }
             
-            if (constructionCompleted.NewBaseCreatedGuid.IsPresent())
+            if (constructionCompleted.BaseGuid != null && GuidHelper.GetObjectFrom(constructionCompleted.BaseGuid).IsEmpty())
             {
-                string newBaseGuid = constructionCompleted.NewBaseCreatedGuid.Get();
-                ConfigureNewlyConstructedBase(newBaseGuid);
+                Log.Info("Creating base: " + constructionCompleted.BaseGuid);
+                ConfigureNewlyConstructedBase(constructionCompleted.BaseGuid);
             }
         }
 
diff --git a/NitroxModel/DataStructures/GameLogic/BasePiece.cs b/NitroxModel/DataStructures/GameLogic/BasePiece.cs
@@ -48,14 +48,7 @@ public string SerializableParentBaseGuid {
         public bool IsFurniture { get; set; }
 
         [ProtoMember(11)]
-        public string SerializableNewBaseGuid
-        {
-            get { return (NewBaseGuid.IsPresent()) ? NewBaseGuid.Get() : null; }
-            set { NewBaseGuid = Optional<string>.OfNullable(value); }
-        }
-
-        [ProtoIgnore]
-        public Optional<string> NewBaseGuid { get; set; }
+        public string BaseGuid { get; set; }
 
         [ProtoMember(12, DynamicType = true)]
         public RotationMetadata SerializableRotationMetadata
@@ -79,7 +72,6 @@ public BasePieceMetadata SerializableMetadata
                 
         public BasePiece()
         {
-            NewBaseGuid = Optional<string>.Empty();
             ParentGuid = Optional<string>.Empty();
             RotationMetadata = Optional<RotationMetadata>.Empty();
             Metadata = Optional<BasePieceMetadata>.Empty();
@@ -97,14 +89,13 @@ public BasePiece(string guid, Vector3 itemPosition, Quaternion rotation, Vector3
             IsFurniture = isFurniture;
             ConstructionAmount = 0.0f;
             ConstructionCompleted = false;
-            NewBaseGuid = Optional<string>.Empty();
             RotationMetadata = rotationMetadata;
             Metadata = Optional<BasePieceMetadata>.Empty();
         }
 
         public override string ToString()
         {
-            return "[BasePiece - ItemPosition: " + ItemPosition + " Guid: " + Guid + " Rotation: " + Rotation + " CameraPosition: " + CameraPosition + "CameraRotation: " + CameraRotation + " TechType: " + TechType + " ParentGuid: " + ParentGuid + " ConstructionAmount: " + ConstructionAmount + " IsFurniture: " + IsFurniture + " NewBaseGuid: " + NewBaseGuid + " RotationMetadata: " + RotationMetadata + "]";
+            return "[BasePiece - ItemPosition: " + ItemPosition + " Guid: " + Guid + " Rotation: " + Rotation + " CameraPosition: " + CameraPosition + "CameraRotation: " + CameraRotation + " TechType: " + TechType + " ParentGuid: " + ParentGuid + " ConstructionAmount: " + ConstructionAmount + " IsFurniture: " + IsFurniture + " BaseGuid: " + BaseGuid + " RotationMetadata: " + RotationMetadata + "]";
         }
     }
 }
diff --git a/NitroxModel/Packets/ConstructionCompleted.cs b/NitroxModel/Packets/ConstructionCompleted.cs
@@ -1,24 +1,22 @@
 ﻿using System;
-using NitroxModel.DataStructures.Util;
-using UnityEngine;
 
 namespace NitroxModel.Packets
 {
     [Serializable]
     public class ConstructionCompleted : Packet
     {
         public string Guid { get; }
-        public Optional<string> NewBaseCreatedGuid { get; }
+        public string BaseGuid { get; }
 
-        public ConstructionCompleted(string guid, Optional<string> newBaseCreatedGuid)
+        public ConstructionCompleted(string guid, string baseGuid)
         {
             Guid = guid;
-            NewBaseCreatedGuid = newBaseCreatedGuid;
+            BaseGuid = baseGuid;
         }
 
         public override string ToString()
         {
-            return "[ConstructionCompleted Guid: " + Guid + " NewBaseCreatedGuid: " + NewBaseCreatedGuid + "]";
+            return "[ConstructionCompleted Guid: " + Guid + " BaseGuid: " + BaseGuid + "]";
         }
     }
 }
diff --git a/NitroxPatcher/Patches/BaseDeconstructable_Deconstruct_Patch.cs b/NitroxPatcher/Patches/BaseDeconstructable_Deconstruct_Patch.cs
@@ -5,7 +5,6 @@
 using Harmony;
 using NitroxClient.GameLogic.Helper;
 using NitroxModel.Helper;
-using NitroxModel.Logger;
 using UnityEngine;
 using static NitroxClient.GameLogic.Helper.TransientLocalObjectManager;
 
diff --git a/NitroxPatcher/Patches/Base_ClearGeometry_Patch.cs b/NitroxPatcher/Patches/Base_ClearGeometry_Patch.cs
@@ -19,7 +19,7 @@ public class Base_ClearGeometry_Patch : NitroxPatch
          * them so that we can update the newly placed pieces with the proper id.  The new
          * pieces are added by Base.SpawnPiece (see that patch)
          */
-        public static Dictionary<Int3, string> LastClearedCellsByGuid = new Dictionary<Int3, string>();
+        public static Dictionary<Vector3, string> LastClearedCellsByPosition = new Dictionary<Vector3, string>();
 
         public static void Prefix(Base __instance)
         {
@@ -43,14 +43,12 @@ public static void Prefix(Base __instance)
                     {
                         Transform child = cellObject.GetChild(i);
 
-                        if(child != null && child.gameObject != null)
+                        if (child != null && child.gameObject != null)
                         {
-                            Int3 cell = __instance.WorldToGrid(child.position);
-
-                            if(cell != Int3.zero && child.gameObject.GetComponent<UniqueIdentifier>() != null)
+                            if(child.gameObject.GetComponent<UniqueIdentifier>() != null)
                             {
                                 string guid = child.gameObject.GetComponent<UniqueIdentifier>().Id;
-                                LastClearedCellsByGuid[cell] = guid;
+                                LastClearedCellsByPosition[child.position] = guid;
                             }
                         }
                     }
diff --git a/NitroxPatcher/Patches/Base_SpawnPiece_Patch.cs b/NitroxPatcher/Patches/Base_SpawnPiece_Patch.cs
@@ -24,11 +24,9 @@ public static void Postfix(Base __instance, Transform __result)
                 return;
             }
    
-            Int3 cell = __instance.WorldToGrid(__result.position);
-
             string guid;
             
-            if (Base_ClearGeometry_Patch.LastClearedCellsByGuid.TryGetValue(cell, out guid))
+            if (Base_ClearGeometry_Patch.LastClearedCellsByPosition.TryGetValue(__result.position, out guid))
             {
                 GuidHelper.SetNewGuid(__result.gameObject, guid);
             }
diff --git a/NitroxServer/Communication/Packets/Processors/ConstructionCompletedPacketProcessor.cs b/NitroxServer/Communication/Packets/Processors/ConstructionCompletedPacketProcessor.cs
@@ -18,7 +18,7 @@ public ConstructionCompletedPacketProcessor(BaseData baseData, PlayerManager pla
 
         public override void Process(ConstructionCompleted packet, Player player)
         {
-            baseData.BasePieceConstructionCompleted(packet.Guid, packet.NewBaseCreatedGuid);
+            baseData.BasePieceConstructionCompleted(packet.Guid, packet.BaseGuid);
             playerManager.SendPacketToOtherPlayers(packet, player);
         }
     }
diff --git a/NitroxServer/GameLogic/Bases/BaseData.cs b/NitroxServer/GameLogic/Bases/BaseData.cs
@@ -67,7 +67,7 @@ public void BasePieceConstructionAmountChanged(string guid, float constructionAm
             }
         }
 
-        public void BasePieceConstructionCompleted(string guid, Optional<string> newlyCreatedParentGuid)
+        public void BasePieceConstructionCompleted(string guid, string baseGuid)
         {
             BasePiece basePiece;
 
@@ -77,14 +77,10 @@ public void BasePieceConstructionCompleted(string guid, Optional<string> newlyCr
                 {
                     basePiece.ConstructionAmount = 1.0f;
                     basePiece.ConstructionCompleted = true;
-                    basePiece.NewBaseGuid = newlyCreatedParentGuid;
+                    basePiece.BaseGuid = baseGuid;
+                    basePiece.ParentGuid = Optional<string>.OfNullable(baseGuid);
 
-                    if (newlyCreatedParentGuid.IsPresent())
-                    {
-                        basePiece.ParentGuid = Optional<string>.Empty();
-                    }
-
-                    lock(completedBasePieceHistory)
+                    lock (completedBasePieceHistory)
                     {
                         completedBasePieceHistory.Add(basePiece);
                     }
diff --git a/NitroxServer/Serialization/World/PersistedWorldData.cs b/NitroxServer/Serialization/World/PersistedWorldData.cs
@@ -14,7 +14,7 @@ namespace NitroxServer.Serialization.World
     [ProtoContract]
     public class PersistedWorldData
     {
-        private const long CURRENT_VERSION = 5;
+        private const long CURRENT_VERSION = 6;
 
         [ProtoMember(1)]
         public long version { get; set; } = CURRENT_VERSION;

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public ConstructionCompletedProcessor(BuildThrottlingQueue buildEventQueue)`
`16`	`16`
`17`	`17`	`public override void Process(ConstructionCompleted completedPacket)`
`18`	`18`	`{`
`19`		`- Log.Debug("Processing ConstructionCompleted " + completedPacket.Guid + " " + completedPacket.NewBaseCreatedGuid);`
`20`		`- buildEventQueue.EnqueueConstructionCompleted(completedPacket.Guid, completedPacket.NewBaseCreatedGuid);`
	`19`	`+ Log.Debug("Processing ConstructionCompleted " + completedPacket.Guid + " " + completedPacket.BaseGuid);`
	`20`	`+ buildEventQueue.EnqueueConstructionCompleted(completedPacket.Guid, completedPacket.BaseGuid);`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,8 @@ private void SpawnBasePieces(List<BasePiece> basePieces)`
`216`	`216`	`buildEventQueue.EnqueueBasePiecePlaced(basePiece);`
`217`	`217`
`218`	`218`	`if (basePiece.ConstructionCompleted)`
`219`		`- {`
`220`		`- buildEventQueue.EnqueueConstructionCompleted(basePiece.Guid, basePiece.NewBaseGuid);`
	`219`	`+ {`
	`220`	`+ buildEventQueue.EnqueueConstructionCompleted(basePiece.Guid, basePiece.BaseGuid);`
`221`	`221`	`}`
`222`	`222`	`else`
`223`	`223`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ public void EnqueueBasePiecePlaced(BasePiece basePiece)`
`32`	`32`	`Enqueue(new BasePiecePlacedEvent(basePiece));`
`33`	`33`	`}`
`34`	`34`
`35`		`- public void EnqueueConstructionCompleted(string guid, Optional<string> newBaseCreatedGuid)`
	`35`	`+ public void EnqueueConstructionCompleted(string guid, string baseGuid)`
`36`	`36`	`{`
`37`	`37`	`Log.Info("Enqueuing item to have construction completed " + guid);`
`38`		`- Enqueue(new ConstructionCompletedEvent(guid, newBaseCreatedGuid));`
	`38`	`+ Enqueue(new ConstructionCompletedEvent(guid, baseGuid));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public void EnqueueAmountChanged(string guid, float amount)`
`@@ -97,12 +97,12 @@ public bool RequiresFreshFrame()`
`97`	`97`	`public class ConstructionCompletedEvent : BuildEvent`
`98`	`98`	`{`
`99`	`99`	`public string Guid { get; }`
`100`		`- public Optional<string> NewBaseCreatedGuid { get; }`
	`100`	`+ public string BaseGuid { get; }`
`101`	`101`
`102`		`- public ConstructionCompletedEvent(string guid, Optional<string> newBaseCreatedGuid)`
	`102`	`+ public ConstructionCompletedEvent(string guid, string baseGuid)`
`103`	`103`	`{`
`104`	`104`	`Guid = guid;`
`105`		`- NewBaseCreatedGuid = newBaseCreatedGuid;`
	`105`	`+ BaseGuid = baseGuid;`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public bool RequiresFreshFrame()`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ private void ActionBuildEvent(BuildEvent buildEvent)`
`108`	`108`
`109`	`109`	`private void BuildBasePiece(BasePiecePlacedEvent basePiecePlacedBuildEvent)`
`110`	`110`	`{`
	`111`	`+ Log.Info("BuildBasePiece " + basePiecePlacedBuildEvent.BasePiece.Guid + " " + basePiecePlacedBuildEvent.BasePiece.TechType);`
`111`	`112`	`BasePiece basePiece = basePiecePlacedBuildEvent.BasePiece;`
`112`	`113`	`GameObject buildPrefab = CraftData.GetBuildPrefab(basePiece.TechType);`
`113`	`114`	`MultiplayerBuilder.overridePosition = basePiece.ItemPosition;`
`@@ -124,7 +125,7 @@ private void BuildBasePiece(BasePiecePlacedEvent basePiecePlacedBuildEvent)`
`124`	`125`
`125`	`126`	`if(basePiece.ParentGuid.IsPresent())`
`126`	`127`	`{`
`127`		`- parentBase = GuidHelper.RequireObjectFrom(basePiece.ParentGuid.Get());`
	`128`	`+ parentBase = GuidHelper.GetObjectFrom(basePiece.ParentGuid.Get()).OrElse(null);`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`Constructable constructable;`
`@@ -155,6 +156,7 @@ private void BuildBasePiece(BasePiecePlacedEvent basePiecePlacedBuildEvent)`
`155`	`156`
`156`	`157`	`private void ConstructionCompleted(ConstructionCompletedEvent constructionCompleted)`
`157`	`158`	`{`
	`159`	`+ Log.Info("Constructed completed " + constructionCompleted.Guid);`
`158`	`160`	`GameObject constructing = GuidHelper.RequireObjectFrom(constructionCompleted.Guid);`
`159`	`161`
`160`	`162`	`ConstructableBase constructableBase = constructing.GetComponent<ConstructableBase>();`
`@@ -176,12 +178,12 @@ private void ConstructionCompleted(ConstructionCompletedEvent constructionComple`
`176`	`178`	`Constructable constructable = constructing.GetComponent<Constructable>();`
`177`	`179`	`constructable.constructedAmount = 1f;`
`178`	`180`	`constructable.SetState(true, true);`
`179`		`- }`
	`181`	`+ }`
`180`	`182`
`181`		`- if (constructionCompleted.NewBaseCreatedGuid.IsPresent())`
	`183`	`+ if (constructionCompleted.BaseGuid != null && GuidHelper.GetObjectFrom(constructionCompleted.BaseGuid).IsEmpty())`
`182`	`184`	`{`
`183`		`- string newBaseGuid = constructionCompleted.NewBaseCreatedGuid.Get();`
`184`		`- ConfigureNewlyConstructedBase(newBaseGuid);`
	`185`	`+ Log.Info("Creating base: " + constructionCompleted.BaseGuid);`
	`186`	`+ ConfigureNewlyConstructedBase(constructionCompleted.BaseGuid);`
`185`	`187`	`}`
`186`	`188`	`}`
`187`	`189`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,7 @@ public string SerializableParentBaseGuid {`
`48`	`48`	`public bool IsFurniture { get; set; }`
`49`	`49`
`50`	`50`	`[ProtoMember(11)]`
`51`		`- public string SerializableNewBaseGuid`
`52`		`- {`
`53`		`- get { return (NewBaseGuid.IsPresent()) ? NewBaseGuid.Get() : null; }`
`54`		`- set { NewBaseGuid = Optional<string>.OfNullable(value); }`
`55`		`- }`
`56`		`-`
`57`		`- [ProtoIgnore]`
`58`		`- public Optional<string> NewBaseGuid { get; set; }`
	`51`	`+ public string BaseGuid { get; set; }`
`59`	`52`
`60`	`53`	`[ProtoMember(12, DynamicType = true)]`
`61`	`54`	`public RotationMetadata SerializableRotationMetadata`
`@@ -79,7 +72,6 @@ public BasePieceMetadata SerializableMetadata`
`79`	`72`
`80`	`73`	`public BasePiece()`
`81`	`74`	`{`
`82`		`- NewBaseGuid = Optional<string>.Empty();`
`83`	`75`	`ParentGuid = Optional<string>.Empty();`
`84`	`76`	`RotationMetadata = Optional<RotationMetadata>.Empty();`
`85`	`77`	`Metadata = Optional<BasePieceMetadata>.Empty();`
`@@ -97,14 +89,13 @@ public BasePiece(string guid, Vector3 itemPosition, Quaternion rotation, Vector3`
`97`	`89`	`IsFurniture = isFurniture;`
`98`	`90`	`ConstructionAmount = 0.0f;`
`99`	`91`	`ConstructionCompleted = false;`
`100`		`- NewBaseGuid = Optional<string>.Empty();`
`101`	`92`	`RotationMetadata = rotationMetadata;`
`102`	`93`	`Metadata = Optional<BasePieceMetadata>.Empty();`
`103`	`94`	`}`
`104`	`95`
`105`	`96`	`public override string ToString()`
`106`	`97`	`{`
`107`		`- return "[BasePiece - ItemPosition: " + ItemPosition + " Guid: " + Guid + " Rotation: " + Rotation + " CameraPosition: " + CameraPosition + "CameraRotation: " + CameraRotation + " TechType: " + TechType + " ParentGuid: " + ParentGuid + " ConstructionAmount: " + ConstructionAmount + " IsFurniture: " + IsFurniture + " NewBaseGuid: " + NewBaseGuid + " RotationMetadata: " + RotationMetadata + "]";`
	`98`	`+ return "[BasePiece - ItemPosition: " + ItemPosition + " Guid: " + Guid + " Rotation: " + Rotation + " CameraPosition: " + CameraPosition + "CameraRotation: " + CameraRotation + " TechType: " + TechType + " ParentGuid: " + ParentGuid + " ConstructionAmount: " + ConstructionAmount + " IsFurniture: " + IsFurniture + " BaseGuid: " + BaseGuid + " RotationMetadata: " + RotationMetadata + "]";`
`108`	`99`	`}`
`109`	`100`	`}`
`110`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,22 @@`
`1`	`1`	`using System;`
`2`		`-using NitroxModel.DataStructures.Util;`
`3`		`-using UnityEngine;`
`4`	`2`
`5`	`3`	`namespace NitroxModel.Packets`
`6`	`4`	`{`
`7`	`5`	`[Serializable]`
`8`	`6`	`public class ConstructionCompleted : Packet`
`9`	`7`	`{`
`10`	`8`	`public string Guid { get; }`
`11`		`- public Optional<string> NewBaseCreatedGuid { get; }`
	`9`	`+ public string BaseGuid { get; }`
`12`	`10`
`13`		`- public ConstructionCompleted(string guid, Optional<string> newBaseCreatedGuid)`
	`11`	`+ public ConstructionCompleted(string guid, string baseGuid)`
`14`	`12`	`{`
`15`	`13`	`Guid = guid;`
`16`		`- NewBaseCreatedGuid = newBaseCreatedGuid;`
	`14`	`+ BaseGuid = baseGuid;`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`public override string ToString()`
`20`	`18`	`{`
`21`		`- return "[ConstructionCompleted Guid: " + Guid + " NewBaseCreatedGuid: " + NewBaseCreatedGuid + "]";`
	`19`	`+ return "[ConstructionCompleted Guid: " + Guid + " BaseGuid: " + BaseGuid + "]";`
`22`	`20`	`}`
`23`	`21`	`}`
`24`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class Base_ClearGeometry_Patch : NitroxPatch`
`19`	`19`	`* them so that we can update the newly placed pieces with the proper id. The new`
`20`	`20`	`* pieces are added by Base.SpawnPiece (see that patch)`
`21`	`21`	`*/`
`22`		`- public static Dictionary<Int3, string> LastClearedCellsByGuid = new Dictionary<Int3, string>();`
	`22`	`+ public static Dictionary<Vector3, string> LastClearedCellsByPosition = new Dictionary<Vector3, string>();`
`23`	`23`
`24`	`24`	`public static void Prefix(Base __instance)`
`25`	`25`	`{`
`@@ -43,14 +43,12 @@ public static void Prefix(Base __instance)`
`43`	`43`	`{`
`44`	`44`	`Transform child = cellObject.GetChild(i);`
`45`	`45`
`46`		`- if(child != null && child.gameObject != null)`
	`46`	`+ if (child != null && child.gameObject != null)`
`47`	`47`	`{`
`48`		`- Int3 cell = __instance.WorldToGrid(child.position);`
`49`		`-`
`50`		`- if(cell != Int3.zero && child.gameObject.GetComponent<UniqueIdentifier>() != null)`
	`48`	`+ if(child.gameObject.GetComponent<UniqueIdentifier>() != null)`
`51`	`49`	`{`
`52`	`50`	`string guid = child.gameObject.GetComponent<UniqueIdentifier>().Id;`
`53`		`- LastClearedCellsByGuid[cell] = guid;`
	`51`	`+ LastClearedCellsByPosition[child.position] = guid;`
`54`	`52`	`}`
`55`	`53`	`}`
`56`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,9 @@ public static void Postfix(Base __instance, Transform __result)`
`24`	`24`	`return;`
`25`	`25`	`}`
`26`	`26`
`27`		`- Int3 cell = __instance.WorldToGrid(__result.position);`
`28`		`-`
`29`	`27`	`string guid;`
`30`	`28`
`31`		`- if (Base_ClearGeometry_Patch.LastClearedCellsByGuid.TryGetValue(cell, out guid))`
	`29`	`+ if (Base_ClearGeometry_Patch.LastClearedCellsByPosition.TryGetValue(__result.position, out guid))`
`32`	`30`	`{`
`33`	`31`	`GuidHelper.SetNewGuid(__result.gameObject, guid);`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public ConstructionCompletedPacketProcessor(BaseData baseData, PlayerManager pla`
`18`	`18`
`19`	`19`	`public override void Process(ConstructionCompleted packet, Player player)`
`20`	`20`	`{`
`21`		`- baseData.BasePieceConstructionCompleted(packet.Guid, packet.NewBaseCreatedGuid);`
	`21`	`+ baseData.BasePieceConstructionCompleted(packet.Guid, packet.BaseGuid);`
`22`	`22`	`playerManager.SendPacketToOtherPlayers(packet, player);`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void BasePieceConstructionAmountChanged(string guid, float constructionAm`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- public void BasePieceConstructionCompleted(string guid, Optional<string> newlyCreatedParentGuid)`
	`70`	`+ public void BasePieceConstructionCompleted(string guid, string baseGuid)`
`71`	`71`	`{`
`72`	`72`	`BasePiece basePiece;`
`73`	`73`
`@@ -77,14 +77,10 @@ public void BasePieceConstructionCompleted(string guid, Optional<string> newlyCr`
`77`	`77`	`{`
`78`	`78`	`basePiece.ConstructionAmount = 1.0f;`
`79`	`79`	`basePiece.ConstructionCompleted = true;`
`80`		`- basePiece.NewBaseGuid = newlyCreatedParentGuid;`
	`80`	`+ basePiece.BaseGuid = baseGuid;`
	`81`	`+ basePiece.ParentGuid = Optional<string>.OfNullable(baseGuid);`
`81`	`82`
`82`		`- if (newlyCreatedParentGuid.IsPresent())`
`83`		`- {`
`84`		`- basePiece.ParentGuid = Optional<string>.Empty();`
`85`		`- }`
`86`		`-`
`87`		`- lock(completedBasePieceHistory)`
	`83`	`+ lock (completedBasePieceHistory)`
`88`	`84`	`{`
`89`	`85`	`completedBasePieceHistory.Add(basePiece);`
`90`	`86`	`}`