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

Fixes unreachable code in Map

Browse source
This commit is contained in:
Kamron Batman 2018-09-13 23:30:04 -07:00
parent 0cb14e3ca9
commit 86b63f003d
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Server/Map.cs
View file

@ -548,8 +548,11 @@ namespace Server
surface = id.Surface;
impassable = id.Impassable;
return !((surface || impassable) && staticTiles[i].Z + id.CalcHeight > z && z + height > staticTiles[i].Z)
|| surface && !impassable && z == staticTiles[i].Z + id.CalcHeight;
if ( ( surface || impassable ) && ( staticTiles[i].Z + id.CalcHeight ) > z && ( z + height ) > staticTiles[i].Z )
return false;
if ( surface && !impassable && z == ( staticTiles[i].Z + id.CalcHeight ) )
hasSurface = true;
}
Sector sector = GetSector( x, y );
@ -566,8 +569,11 @@ namespace Server
surface = id.Surface;
impassable = id.Impassable;
return !((surface || impassable || checkBlocksFit && item.BlocksFit) && item.Z + id.CalcHeight > z && z + height > item.Z)
|| surface && !impassable && !item.Movable && z == item.Z + id.CalcHeight;
if ( ( surface || impassable || ( checkBlocksFit && item.BlocksFit ) ) && ( item.Z + id.CalcHeight ) > z && ( z + height ) > item.Z )
return false;
if ( surface && !impassable && !item.Movable && z == ( item.Z + id.CalcHeight ) )
hasSurface = true;
}
}