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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Projects/Server/TileMatrix.cs
View file

@ -191,7 +191,8 @@ namespace Server
if (x < 0 || y < 0 || x >= BlockWidth || y >= BlockHeight)
return;
m_StaticTiles[x] ??= new StaticTile[BlockHeight][][][];
if (m_StaticTiles[x] == null)
m_StaticTiles[x] = new StaticTile[BlockHeight][][][];
m_StaticTiles[x][y] = value;
@ -207,7 +208,8 @@ namespace Server
if (x < 0 || y < 0 || x >= BlockWidth || y >= BlockHeight || DataStream == null || IndexStream == null)
return EmptyStaticBlock;
m_StaticTiles[x] ??= new StaticTile[BlockHeight][][][];
if (m_StaticTiles[x] == null)
m_StaticTiles[x] = new StaticTile[BlockHeight][][][];
StaticTile[][][] tiles = m_StaticTiles[x][y];
@ -285,7 +287,9 @@ namespace Server
if (x < 0 || y < 0 || x >= BlockWidth || y >= BlockHeight)
return;
m_LandTiles[x] ??= new LandTile[BlockHeight][];
if (m_LandTiles[x] == null)
m_LandTiles[x] = new LandTile[BlockHeight][];
m_LandTiles[x][y] = value;
if (m_LandPatches[x] == null)
@ -300,7 +304,8 @@ namespace Server
if (x < 0 || y < 0 || x >= BlockWidth || y >= BlockHeight || MapStream == null)
return m_InvalidLandBlock;
m_LandTiles[x] ??= new LandTile[BlockHeight][];
if (m_LandTiles[x] == null)
m_LandTiles[x] = new LandTile[BlockHeight][];
LandTile[] tiles = m_LandTiles[x][y];
@ -384,7 +389,7 @@ namespace Server
while (pCur < pEnd)
{
lists[pCur->m_X & 0x7][pCur->m_Y & 0x7].Add(pCur->m_ID, pCur->m_Z);
pCur += 1;
pCur = pCur + 1;
}
StaticTile[][][] tiles = new StaticTile[8][][];
@ -464,13 +469,8 @@ namespace Server
}
}
public interface ITile
{
int ID { get; }
}
[StructLayout(LayoutKind.Sequential, Pack = 1)]
public struct LandTile : ITile
public struct LandTile
{
internal short m_ID;
internal sbyte m_Z;
@ -501,7 +501,7 @@ namespace Server
}
[StructLayout(LayoutKind.Sequential, Pack = 1)]
public struct StaticTile : ITile
public struct StaticTile
{
internal ushort m_ID;
internal byte m_X;