Skip to content

Fix PTB ZoneSystem APIs #53

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

Open
jneb802 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix PTB ZoneSystem APIs #53

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
5 changes: 2 additions & 3 deletions Dungeon_Castle/Src/AltarDoor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ public GameObject FindGameObjectInSector(string prefabName, Vector3 position)
{
int prefabHash = prefabName.GetStableHashCode();

Vector2i sector = ZoneSystem.GetZone(position);
Vector2s sector = ZoneSystem.GetZone(position);

int sectorIndex = ZDOMan.instance.SectorToIndex(sector);
int sectorIndex = (int)ZoneSystem.SectorToIndex(sector).Sector;

if (sectorIndex < 0 || sectorIndex >= ZDOMan.instance.m_objectsBySector.Length)
{
Expand Down Expand Up @@ -128,4 +128,3 @@ public GameObject FindGameObjectInSector(string prefabName, Vector3 position)

}
}

5 changes: 2 additions & 3 deletions Dungeon_The Ritual/Src/AttachPuzzle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ public GameObject FindGameObjectInSector(string prefabName, Vector3 position)
{
int prefabHash = prefabName.GetStableHashCode();

Vector2i sector = ZoneSystem.GetZone(position);
Vector2s sector = ZoneSystem.GetZone(position);

int sectorIndex = ZDOMan.instance.SectorToIndex(sector);
int sectorIndex = (int)ZoneSystem.SectorToIndex(sector).Sector;

if (sectorIndex >= 0 && sectorIndex < ZDOMan.instance.m_objectsBySector.Length)
{
Expand Down Expand Up @@ -265,4 +265,3 @@ public class PuzzleStand
public int puzzlePosition = new int();
}
}

4 changes: 2 additions & 2 deletions More World Locations_AIO/Src/Ports/src/PortManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void Awake()
public void UpdatePortLocations()
{
if (!ZNet.instance || !ZNet.instance.IsServer() || !ZoneSystem.instance) return;
Dictionary<Vector2i, ZoneSystem.LocationInstance>.ValueCollection? allLocations = ZoneSystem.instance.GetLocationList();
var allLocations = ZoneSystem.instance.GetLocationList();
List<ZoneSystem.LocationInstance> ports = allLocations.Where(location => location.m_location.m_group == "MWL_Ports").ToList();
if (ports.Count == 0) return;
More_World_Locations_AIOPlugin.More_World_Locations_AIOLogger.LogDebug($"Registered {ports.Count} ports");
Expand Down Expand Up @@ -112,4 +112,4 @@ public SerializedVector(Vector3 vector)

public Vector3 ToVector3() => new Vector3(x, y, z);
}
}
}