Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.24.4 #991

Merged
merged 1 commit into from
Nov 4, 2024
Merged

1.24.4 #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion NewHorizons/Builder/General/SpawnPointBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,20 @@ public static SpawnPoint Make(GameObject planetGO, SpawnModule module, OWRigidbo
// This was a stupid hack to stop players getting stuck in the ground and now we have to keep it forever
spawnGO.transform.position += spawnGO.transform.TransformDirection(point.offset ?? Vector3.up * 4f);

if (PlayerSpawn == null || point.GetPriority() > PlayerSpawnInfo.GetPriority())
var flagUseTHSpawn = false;
if (Main.Instance.CurrentStarSystem == "SolarSystem")
{
// When in the base solar system, treat the TH spawn point as being isDefault
// If the priority of any new spawn point is less than that, ignore it
// Do take them if they're equal tho
var minPriority = new SpawnModule.PlayerSpawnPoint() { isDefault = true }.GetPriority();
if (point.GetPriority() < minPriority)
{
//flagUseTHSpawn = true;
}
}

if (!flagUseTHSpawn && (PlayerSpawn == null || point.GetPriority() > PlayerSpawnInfo.GetPriority()))
{
PlayerSpawn = playerSpawn;
PlayerSpawnInfo = point;
Expand Down
2 changes: 1 addition & 1 deletion NewHorizons/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "xen, Bwc9876, JohnCorby, MegaPiggy, Trifid, and friends",
"name": "New Horizons",
"uniqueName": "xen.NewHorizons",
"version": "1.24.3",
"version": "1.24.4",
"owmlVersion": "2.12.1",
"dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
"conflicts": [ "PacificEngine.OW_CommonResources" ],
Expand Down
Loading