warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes searching null map crash (#1975)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

11
Projects/Server/Maps/Map.ClientEnumerator.cs
View file

@ -195,11 +195,14 @@ public partial class Map
_bounds = bounds; _bounds = bounds;
map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY); if (map != null)
{
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)]

11
Projects/Server/Maps/Map.ItemEnumerator.cs
View file

@ -226,11 +226,14 @@ public partial class Map
_bounds = bounds; _bounds = bounds;
map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY); if (map != null)
{
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)]

11
Projects/Server/Maps/Map.MobileEnumerator.cs
View file

@ -225,11 +225,14 @@ public partial class Map
_bounds = bounds; _bounds = bounds;
map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY); if (map != null)
{
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)]

13
Projects/Server/Maps/Map.MultiEnumerator.cs
View file

@ -189,12 +189,15 @@ public partial class Map
_bounds = bounds; _bounds = bounds;
map.CalculateSectors(bounds, out _sectorStartX, out var _sectorStartY, out _sectorEndX, out _sectorEndY); if (map != null)
{
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;
_index = 0; _index = 0;
}
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]