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

fix: Delays getting item id of craftables until they are needed (#1114)

Browse source 
- [X] Fixes world loading for multi.mul. It was taking 10-15s, now takes 1s or less.
- [X] Fixes loading the crafting system by offloading getting a label number to when the item needs it.
This commit is contained in:
Kamron Batman 2022-07-10 22:44:24 -07:00 • committed by GitHub
parent bd4e6fc30e
commit 9c374861d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 64 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Projects/Server/MultiData.cs
View file

@ -171,8 +171,6 @@ public static class MultiData
bin.BaseStream.Seek(lookup, SeekOrigin.Begin);
_components[i] = new MultiComponentList(bin, length, postHSMulFormat);
}
idxReader.Close();
}
}
@ -358,17 +356,6 @@ public sealed class MultiComponentList
var tiles = new TileList[Width][];
Tiles = new StaticTile[Width][][];
for (var x = 0; x < Width; ++x)
{
tiles[x] = new TileList[Height];
Tiles[x] = new StaticTile[Height][];
for (var y = 0; y < Height; ++y)
{
tiles[x][y] = new TileList();
}
}
for (var i = 0; i < allTiles.Length; ++i)
{
if (i == 0 || allTiles[i].Flags != 0)
@ -376,15 +363,21 @@ public sealed class MultiComponentList
var xOffset = allTiles[i].OffsetX + Center.m_X;
var yOffset = allTiles[i].OffsetY + Center.m_Y;
tiles[xOffset] ??= new TileList[Height];
Tiles[xOffset] ??= new StaticTile[Height][];
tiles[xOffset][yOffset] ??= new TileList();
tiles[xOffset][yOffset].Add(allTiles[i].ItemId, (sbyte)allTiles[i].OffsetZ);
}
}
for (var x = 0; x < Width; ++x)
{
Tiles[x] ??= new StaticTile[Height][];
for (var y = 0; y < Height; ++y)
{
Tiles[x][y] = tiles[x][y].ToArray();
var tileList = tiles[x]?[y];
Tiles[x][y] = tileList?.ToArray() ?? Array.Empty<StaticTile>();
}
}
}