diff --git a/Scripts/Engines/Pathing/Movement.cs b/Scripts/Engines/Pathing/Movement.cs index d62c48dd8..262690380 100644 --- a/Scripts/Engines/Pathing/Movement.cs +++ b/Scripts/Engines/Pathing/Movement.cs @@ -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 ); } } diff --git a/Scripts/Items/Construction/Doors/BaseDoor.cs b/Scripts/Items/Construction/Doors/BaseDoor.cs index 6d0b7fb37..b2c37e100 100644 --- a/Scripts/Items/Construction/Doors/BaseDoor.cs +++ b/Scripts/Items/Construction/Doors/BaseDoor.cs @@ -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; diff --git a/Scripts/Multis/Boats/BaseBoat.cs b/Scripts/Multis/Boats/BaseBoat.cs index f6090ed88..87c492d27 100644 --- a/Scripts/Multis/Boats/BaseBoat.cs +++ b/Scripts/Multis/Boats/BaseBoat.cs @@ -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; diff --git a/Scripts/Regions/BaseRegion.cs b/Scripts/Regions/BaseRegion.cs index d92fba67e..9545a659d 100644 --- a/Scripts/Regions/BaseRegion.cs +++ b/Scripts/Regions/BaseRegion.cs @@ -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 ); diff --git a/Server/Item.cs b/Server/Item.cs index 7633a36dc..c71e5661b 100644 --- a/Server/Item.cs +++ b/Server/Item.cs @@ -3927,7 +3927,7 @@ namespace Server foreach ( Item item in eable ) { - if ( item is BaseMulti ) + if ( item.ItemID > TileData.MaxItemValue ) continue; items.Add( item ); diff --git a/Server/Map.cs b/Server/Map.cs index a1451ff5b..9ac711b69 100644 --- a/Server/Map.cs +++ b/Server/Map.cs @@ -395,7 +395,7 @@ namespace Server { Item item = items[i]; - if ( !(item is BaseMulti) && item.AtWorldPoint( x, y ) ) + if ( item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint( x, y ) ) { ItemData id = item.ItemData; surface = id.Surface; @@ -470,7 +470,7 @@ namespace Server foreach ( Item item in eable ) { - if ( !(item is BaseMulti) ) + if ( item.ItemID <= TileData.MaxItemValue ) { items.Add( item ); @@ -624,7 +624,7 @@ namespace Server { Item item = sector.Items[i]; - if ( !(item is BaseMulti) && item.AtWorldPoint( p.X, p.Y ) && !item.Movable ) + if ( item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint( p.X, p.Y ) && !item.Movable ) { ItemData id = item.ItemData; @@ -1972,7 +1972,7 @@ namespace Server if( !i.Visible ) continue; - if( i is BaseMulti || i.ItemID > TileData.MaxItemValue ) + if( i.ItemID > TileData.MaxItemValue ) continue; ItemData id = i.ItemData;