fix: Fixes searching null map crash (#1975)

This commit is contained in:
Kamron Batman 2024-10-15 17:52:27 -07:00 • committed by GitHub
parent 9f985b0c38
commit 3fc55e4db3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 17 deletions

View file

@ -195,12 +195,15 @@ public partial class Map
_bounds = bounds; _bounds = bounds;
if (map != null)
{
map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY); map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY);
// We start the X sector one short because it gets incremented immediately in MoveNext() // We start the X sector one short because it gets incremented immediately in MoveNext()
_currentSectorX = _sectorStartX - 1; _currentSectorX = _sectorStartX - 1;
_currentSectorY = _sectorStartY; _currentSectorY = _sectorStartY;
} }
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool MoveNext() public bool MoveNext()

View file

@ -226,12 +226,15 @@ public partial class Map
_bounds = bounds; _bounds = bounds;
if (map != null)
{
map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY); map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY);
// We start the X sector one short because it gets incremented immediately in MoveNext() // We start the X sector one short because it gets incremented immediately in MoveNext()
_currentSectorX = _sectorStartX - 1; _currentSectorX = _sectorStartX - 1;
_currentSectorY = _sectorStartY; _currentSectorY = _sectorStartY;
} }
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool MoveNext() public bool MoveNext()

View file

@ -225,12 +225,15 @@ public partial class Map
_bounds = bounds; _bounds = bounds;
if (map != null)
{
map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY); map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY);
// We start the X sector one short because it gets incremented immediately in MoveNext() // We start the X sector one short because it gets incremented immediately in MoveNext()
_currentSectorX = _sectorStartX - 1; _currentSectorX = _sectorStartX - 1;
_currentSectorY = _sectorStartY; _currentSectorY = _sectorStartY;
} }
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool MoveNext() public bool MoveNext()

View file

@ -189,6 +189,8 @@ public partial class Map
_bounds = bounds; _bounds = bounds;
if (map != null)
{
map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY); map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY);
// We start the X sector one short because it gets incremented immediately in MoveNext() // We start the X sector one short because it gets incremented immediately in MoveNext()
@ -196,6 +198,7 @@ public partial class Map
_currentSectorY = _sectorStartY; _currentSectorY = _sectorStartY;
_index = 0; _index = 0;
} }
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private bool GetMulti() private bool GetMulti()