diff --git a/NewHorizons/Builder/Props/DialogueBuilder.cs b/NewHorizons/Builder/Props/DialogueBuilder.cs index b20a57d5..f76f54da 100644 --- a/NewHorizons/Builder/Props/DialogueBuilder.cs +++ b/NewHorizons/Builder/Props/DialogueBuilder.cs @@ -103,7 +103,7 @@ namespace NewHorizons.Builder.Props conversationZone.transform.parent = planetGO.transform.Find(info.pathToAnimController); } - conversationZone.transform.position = planetGO.transform.TransformPoint(info.position); + conversationZone.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero); conversationZone.SetActive(true); return dialogueTree; diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index 91f40d97..f7ff7099 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -147,7 +147,7 @@ namespace NewHorizons.Builder.Props } } - nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info.position); + nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero); if (info.normal != null) { // In global coordinates (normal was in local coordinates) diff --git a/NewHorizons/Builder/Props/RaftBuilder.cs b/NewHorizons/Builder/Props/RaftBuilder.cs index 742f1b65..d1393fbd 100644 --- a/NewHorizons/Builder/Props/RaftBuilder.cs +++ b/NewHorizons/Builder/Props/RaftBuilder.cs @@ -54,7 +54,7 @@ namespace NewHorizons.Builder.Props GameObject raftObject = _prefab.InstantiateInactive(); raftObject.name = "Raft_Body"; raftObject.transform.parent = sector?.transform ?? planetGO.transform; - raftObject.transform.position = planetGO.transform.TransformPoint(info.position); + raftObject.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero); raftObject.transform.rotation = planetGO.transform.TransformRotation(Quaternion.identity); StreamingHandler.SetUpStreaming(raftObject, sector); diff --git a/NewHorizons/Utility/DebugMenu/DebugMenuNomaiText.cs b/NewHorizons/Utility/DebugMenu/DebugMenuNomaiText.cs index 522751c0..3569c540 100644 --- a/NewHorizons/Utility/DebugMenu/DebugMenuNomaiText.cs +++ b/NewHorizons/Utility/DebugMenu/DebugMenuNomaiText.cs @@ -489,7 +489,7 @@ namespace NewHorizons.Utility.DebugMenu var planetGO = sectorParent; var info = conversationMetadata.conversation; - nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info.position); + nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero); if (info.normal != null) { // In global coordinates (normal was in local coordinates) diff --git a/NewHorizons/Utility/MVector3.cs b/NewHorizons/Utility/MVector3.cs index 1ddebe6d..6369dd44 100644 --- a/NewHorizons/Utility/MVector3.cs +++ b/NewHorizons/Utility/MVector3.cs @@ -23,7 +23,6 @@ namespace NewHorizons.Utility public static implicit operator Vector3(MVector3 vec) { - if (vec == null) return Vector3.zero; return new Vector3(vec.x, vec.y, vec.z); } }