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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

131
Server/TileMatrix.cs
View file

@ -21,6 +21,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@ -52,7 +53,7 @@ namespace Server
private StaticTile[] m_TileBuffer = new StaticTile[128];
private TileList m_TilesList = new TileList();
private int m_Width, m_Height;
// private int m_Width, m_Height;
public TileMatrix(Map owner, int fileIndex, int mapID, int width, int height)
{
@ -77,8 +78,8 @@ namespace Server
}
m_FileIndex = fileIndex;
m_Width = width;
m_Height = height;
// m_Width = width;
// m_Height = height;
BlockWidth = width >> 3;
BlockHeight = height >> 3;
@ -212,42 +213,37 @@ namespace Server
StaticTile[][][] tiles = m_StaticTiles[x][y];
if (tiles == null)
if (tiles != null)
return tiles;
lock (m_FileShare)
{
lock (m_FileShare)
for (int i = 0; tiles == null && i < m_FileShare.Count; ++i)
{
for (int i = 0; tiles == null && i < m_FileShare.Count; ++i)
TileMatrix shared = m_FileShare[i];
lock (shared)
{
TileMatrix shared = m_FileShare[i];
lock (shared)
if (x >= 0 && x < shared.BlockWidth && y >= 0 && y < shared.BlockHeight)
{
if (x >= 0 && x < shared.BlockWidth && y >= 0 && y < shared.BlockHeight)
StaticTile[][][][] theirTiles = shared.m_StaticTiles[x];
if (theirTiles != null)
tiles = theirTiles[y];
if (tiles != null)
{
StaticTile[][][][] theirTiles = shared.m_StaticTiles[x];
int[] theirBits = shared.m_StaticPatches[x];
if (theirTiles != null)
tiles = theirTiles[y];
if (tiles != null)
{
int[] theirBits = shared.m_StaticPatches[x];
if (theirBits != null && (theirBits[y >> 5] & (1 << (y & 0x1F))) != 0)
tiles = null;
}
if (theirBits != null && (theirBits[y >> 5] & (1 << (y & 0x1F))) != 0)
tiles = null;
}
}
}
}
if (tiles == null)
tiles = ReadStaticBlock(x, y);
m_StaticTiles[x][y] = tiles;
}
return tiles;
return m_StaticTiles[x][y] = tiles ?? ReadStaticBlock(x, y);
}
public StaticTile[] GetStaticTiles(int x, int y)
@ -262,34 +258,27 @@ namespace Server
{
StaticTile[][][] tiles = GetStaticBlock(x >> 3, y >> 3);
if (multis)
{
IPooledEnumerable<StaticTile[]> eable = m_Owner.GetMultiTilesAt(x, y);
if (!multis)
return tiles[x & 0x7][y & 0x7];
if (eable == Map.NullEnumerable<StaticTile[]>.Instance)
return tiles[x & 0x7][y & 0x7];
IPooledEnumerable<StaticTile[]> eable = m_Owner.GetMultiTilesAt(x, y);
bool any = false;
if (eable == Map.NullEnumerable<StaticTile[]>.Instance)
return tiles[x & 0x7][y & 0x7];
foreach (StaticTile[] multiTiles in eable)
{
if (!any)
any = true;
bool any = false;
m_TilesList.AddRange(multiTiles);
}
m_TilesList.AddRange(eable.SelectMany(t => { any = true; return t; }).ToArray());
eable.Free();
eable.Free();
if (!any)
return tiles[x & 0x7][y & 0x7];
if (!any)
return tiles[x & 0x7][y & 0x7];
m_TilesList.AddRange(tiles[x & 0x7][y & 0x7]);
m_TilesList.AddRange(tiles[x & 0x7][y & 0x7]);
return m_TilesList.ToArray();
}
return m_TilesList.ToArray();
return tiles[x & 0x7][y & 0x7];
}
[MethodImpl(MethodImplOptions.Synchronized)]
@ -320,49 +309,42 @@ namespace Server
LandTile[] tiles = m_LandTiles[x][y];
if (tiles == null)
if (tiles != null)
return tiles;
lock (m_FileShare)
{
lock (m_FileShare)
for (int i = 0; tiles == null && i < m_FileShare.Count; ++i)
{
for (int i = 0; tiles == null && i < m_FileShare.Count; ++i)
TileMatrix shared = m_FileShare[i];
lock (shared)
{
TileMatrix shared = m_FileShare[i];
lock (shared)
if (x >= 0 && x < shared.BlockWidth && y >= 0 && y < shared.BlockHeight)
{
if (x >= 0 && x < shared.BlockWidth && y >= 0 && y < shared.BlockHeight)
LandTile[][] theirTiles = shared.m_LandTiles[x];
if (theirTiles != null)
tiles = theirTiles[y];
if (tiles != null)
{
LandTile[][] theirTiles = shared.m_LandTiles[x];
int[] theirBits = shared.m_LandPatches[x];
if (theirTiles != null)
tiles = theirTiles[y];
if (tiles != null)
{
int[] theirBits = shared.m_LandPatches[x];
if (theirBits != null && (theirBits[y >> 5] & (1 << (y & 0x1F))) != 0)
tiles = null;
}
if (theirBits != null && (theirBits[y >> 5] & (1 << (y & 0x1F))) != 0)
tiles = null;
}
}
}
}
if (tiles == null)
tiles = ReadLandBlock(x, y);
m_LandTiles[x][y] = tiles;
}
return tiles;
return m_LandTiles[x][y] = tiles ?? ReadLandBlock(x, y);
}
public LandTile GetLandTile(int x, int y)
{
LandTile[] tiles = GetLandBlock(x >> 3, y >> 3);
return tiles[((y & 0x7) << 3) + (x & 0x7)];
return GetLandBlock(x >> 3, y >> 3)[((y & 0x7) << 3) + (x & 0x7)];
}
[MethodImpl(MethodImplOptions.Synchronized)]
@ -375,7 +357,8 @@ namespace Server
int lookup = IndexReader.ReadInt32();
int length = IndexReader.ReadInt32();
if (lookup < 0 || length <= 0) return EmptyStaticBlock;
if (lookup < 0 || length <= 0)
return EmptyStaticBlock;
int count = length / 7;