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

Browse source
This commit is contained in:
mark 2010-12-08 10:42:10 +00:00
parent af37bba9b8
commit 712037724a
6 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Scripts/Engines/Pathing/Movement.cs
View file

@ -2,7 +2,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using Server;
using Server.Items;
using Server.Mobiles;
namespace Server.Movement
@ -320,13 +319,13 @@ namespace Server.Movement
if ( (item.ItemData.Flags & reqFlags) == 0 )
continue;
if ( sector == sectorStart && item.AtWorldPoint( xStart, yStart ) && !(item is BaseMulti) )
if ( sector == sectorStart && item.AtWorldPoint( xStart, yStart ) && item.ItemID <= TileData.MaxItemValue )
itemsStart.Add( item );
else if ( sector == sectorForward && item.AtWorldPoint( xForward, yForward ) && !(item is BaseMulti) )
else if ( sector == sectorForward && item.AtWorldPoint( xForward, yForward ) && item.ItemID <= TileData.MaxItemValue )
itemsForward.Add( item );
else if ( sector == sectorLeft && item.AtWorldPoint( xLeft, yLeft ) && !(item is BaseMulti) )
else if ( sector == sectorLeft && item.AtWorldPoint( xLeft, yLeft ) && item.ItemID <= TileData.MaxItemValue )
itemsLeft.Add( item );
else if ( sector == sectorRight && item.AtWorldPoint( xRight, yRight ) && !(item is BaseMulti) )
else if ( sector == sectorRight && item.AtWorldPoint( xRight, yRight ) && item.ItemID <= TileData.MaxItemValue )
itemsRight.Add( item );
}
}
@ -351,9 +350,9 @@ namespace Server.Movement
if ( (item.ItemData.Flags & reqFlags) == 0 )
continue;
if ( item.AtWorldPoint( xStart, yStart ) && !(item is BaseMulti) )
if ( item.AtWorldPoint( xStart, yStart ) && item.ItemID <= TileData.MaxItemValue )
itemsStart.Add( item );
else if ( item.AtWorldPoint( xForward, yForward ) && !(item is BaseMulti) )
else if ( item.AtWorldPoint( xForward, yForward ) && item.ItemID <= TileData.MaxItemValue )
itemsForward.Add( item );
}
}
@ -369,7 +368,7 @@ namespace Server.Movement
if ( (item.ItemData.Flags & reqFlags) == 0 )
continue;
if ( item.AtWorldPoint( xForward, yForward ) && !(item is BaseMulti) )
if ( item.AtWorldPoint( xForward, yForward ) && item.ItemID <= TileData.MaxItemValue )
itemsForward.Add( item );
}
@ -383,7 +382,7 @@ namespace Server.Movement
if ( (item.ItemData.Flags & reqFlags) == 0 )
continue;
if ( item.AtWorldPoint( xStart, yStart ) && !(item is BaseMulti) )
if ( item.AtWorldPoint( xStart, yStart ) && item.ItemID <= TileData.MaxItemValue )
itemsStart.Add( item );
}
}

2
Scripts/Items/Construction/Doors/BaseDoor.cs
View file

@ -288,7 +288,7 @@ namespace Server.Items
{
Item item = items[i];
if ( !(item is BaseMulti) && item.AtWorldPoint( x, y ) && !(item is BaseDoor) )
if ( item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint( x, y ) && !(item is BaseDoor) )
{
ItemData id = item.ItemData;
bool surface = id.Surface;

2
Scripts/Multis/Boats/BaseBoat.cs
View file

@ -1221,7 +1221,7 @@ namespace Server.Multis
foreach ( Item item in eable )
{
if ( item is BaseMulti || item.Z < p.Z || !item.Visible )
if ( item.ItemID > TileData.MaxItemValue || item.Z < p.Z || !item.Visible )
continue;
int x = item.X - p.X + newComponents.Min.X;

3
Scripts/Regions/BaseRegion.cs
View file

@ -3,7 +3,6 @@ using System.Collections;
using System.Collections.Generic;
using System.Xml;
using Server;
using Server.Items;
namespace Server.Regions
{
@ -310,7 +309,7 @@ namespace Server.Regions
{
Item item = sector.Items[j];
if ( !(item is BaseMulti) && item.AtWorldPoint( x, y ) )
if ( item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint( x, y ) )
{
m_SpawnBuffer2.Add( item );