## Bug fixes
- Continue trying to pair singularities even if some are set up
improperly. Fixes a bug with Divergence.
This commit is contained in:
Will Corby 2023-08-12 11:23:46 -07:00 committed by GitHub
commit dcbcbd266e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -113,24 +113,24 @@ namespace NewHorizons.Builder.Body
if (!_singularitiesByID.TryGetValue(blackHoleID, out GameObject blackHole)) if (!_singularitiesByID.TryGetValue(blackHoleID, out GameObject blackHole))
{ {
NHLogger.LogWarning($"Black hole [{blackHoleID}] is missing."); NHLogger.LogWarning($"Black hole [{blackHoleID}] is missing.");
break; continue;
} }
if (!_singularitiesByID.TryGetValue(whiteHoleID, out GameObject whiteHole)) if (!_singularitiesByID.TryGetValue(whiteHoleID, out GameObject whiteHole))
{ {
NHLogger.LogWarning($"White hole [{whiteHoleID}] is missing."); NHLogger.LogWarning($"White hole [{whiteHoleID}] is missing.");
break; continue;
} }
var whiteHoleVolume = whiteHole.GetComponentInChildren<WhiteHoleVolume>(); var whiteHoleVolume = whiteHole.GetComponentInChildren<WhiteHoleVolume>();
var blackHoleVolume = blackHole.GetComponentInChildren<BlackHoleVolume>(); var blackHoleVolume = blackHole.GetComponentInChildren<BlackHoleVolume>();
if (whiteHoleVolume == null || blackHoleVolume == null) if (whiteHoleVolume == null || blackHoleVolume == null)
{ {
NHLogger.LogWarning($"Singularities [{blackHoleID}] and [{whiteHoleID}] do not have compatible polarities."); NHLogger.LogWarning($"Singularities [{blackHoleID}] and [{whiteHoleID}] do not have compatible polarities.");
break; continue;
} }
if (blackHoleVolume._whiteHole != null && blackHoleVolume._whiteHole != whiteHoleVolume) if (blackHoleVolume._whiteHole != null && blackHoleVolume._whiteHole != whiteHoleVolume)
{ {
NHLogger.LogWarning($"Black hole [{blackHoleID}] has already been linked!"); NHLogger.LogWarning($"Black hole [{blackHoleID}] has already been linked!");
break; continue;
} }
NHLogger.LogVerbose($"Pairing singularities [{blackHoleID}], [{whiteHoleID}]"); NHLogger.LogVerbose($"Pairing singularities [{blackHoleID}], [{whiteHoleID}]");
blackHoleVolume._whiteHole = whiteHoleVolume; blackHoleVolume._whiteHole = whiteHoleVolume;

View File

@ -4,7 +4,7 @@
"author": "xen, Bwc9876, clay, MegaPiggy, John, Trifid, Hawkbar, Book", "author": "xen, Bwc9876, clay, MegaPiggy, John, Trifid, Hawkbar, Book",
"name": "New Horizons", "name": "New Horizons",
"uniqueName": "xen.NewHorizons", "uniqueName": "xen.NewHorizons",
"version": "1.14.2", "version": "1.14.3",
"owmlVersion": "2.9.3", "owmlVersion": "2.9.3",
"dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],