Merge branch 'planetary-features' into bwc9876/custom-ship-log

This commit is contained in:
Ben C 2022-02-06 11:15:27 -05:00
commit 67372d3bf6

View File

@ -16,7 +16,7 @@ namespace NewHorizons.Builder.Props
public static void Make(GameObject go, Sector sector, PropModule.DialogueInfo info, IModHelper mod)
{
if (PlayerData._currentGameSave.GetPersistentCondition(info.blockAfterPersistentCondition)) return;
if (info.blockAfterPersistentCondition != null && PlayerData._currentGameSave.GetPersistentCondition(info.blockAfterPersistentCondition)) return;
var dialogue = MakeConversationZone(go, sector, info, mod);
if (info.remoteTriggerPosition != null) MakeRemoteDialogueTrigger(go, sector, info, dialogue);