diff --git a/Scripts/Engines/Pathing/Movement.cs b/Scripts/Engines/Pathing/Movement.cs index e9a775dd8..d62c48dd8 100644 --- a/Scripts/Engines/Pathing/Movement.cs +++ b/Scripts/Engines/Pathing/Movement.cs @@ -320,13 +320,13 @@ namespace Server.Movement if ( (item.ItemData.Flags & reqFlags) == 0 ) continue; - if ( sector == sectorStart && item.AtWorldPoint( xStart, yStart ) && item.ItemID <= TileData.MaxItemValue ) + if ( sector == sectorStart && item.AtWorldPoint( xStart, yStart ) && !(item is BaseMulti) ) itemsStart.Add( item ); - else if ( sector == sectorForward && item.AtWorldPoint( xForward, yForward ) && item.ItemID <= TileData.MaxItemValue ) + else if ( sector == sectorForward && item.AtWorldPoint( xForward, yForward ) && !(item is BaseMulti) ) itemsForward.Add( item ); - else if ( sector == sectorLeft && item.AtWorldPoint( xLeft, yLeft ) && item.ItemID <= TileData.MaxItemValue ) + else if ( sector == sectorLeft && item.AtWorldPoint( xLeft, yLeft ) && !(item is BaseMulti) ) itemsLeft.Add( item ); - else if ( sector == sectorRight && item.AtWorldPoint( xRight, yRight ) && item.ItemID <= TileData.MaxItemValue ) + else if ( sector == sectorRight && item.AtWorldPoint( xRight, yRight ) && !(item is BaseMulti) ) itemsRight.Add( item ); } } @@ -351,9 +351,9 @@ namespace Server.Movement if ( (item.ItemData.Flags & reqFlags) == 0 ) continue; - if ( item.AtWorldPoint( xStart, yStart ) && item.ItemID <= TileData.MaxItemValue ) + if ( item.AtWorldPoint( xStart, yStart ) && !(item is BaseMulti) ) itemsStart.Add( item ); - else if ( item.AtWorldPoint( xForward, yForward ) && item.ItemID <= TileData.MaxItemValue ) + else if ( item.AtWorldPoint( xForward, yForward ) && !(item is BaseMulti) ) itemsForward.Add( item ); } } @@ -369,7 +369,7 @@ namespace Server.Movement if ( (item.ItemData.Flags & reqFlags) == 0 ) continue; - if ( item.AtWorldPoint( xForward, yForward ) && item.ItemID <= TileData.MaxItemValue ) + if ( item.AtWorldPoint( xForward, yForward ) && !(item is BaseMulti) ) itemsForward.Add( item ); } @@ -383,7 +383,7 @@ namespace Server.Movement if ( (item.ItemData.Flags & reqFlags) == 0 ) continue; - if ( item.AtWorldPoint( xStart, yStart ) && item.ItemID < 0x4000 ) + if ( item.AtWorldPoint( xStart, yStart ) && !(item is BaseMulti) ) itemsStart.Add( item ); } } diff --git a/Scripts/Multis/HouseFoundation.cs b/Scripts/Multis/HouseFoundation.cs index b48f4374a..e327d5464 100644 --- a/Scripts/Multis/HouseFoundation.cs +++ b/Scripts/Multis/HouseFoundation.cs @@ -209,7 +209,7 @@ namespace Server.Multis for( int i = 0; i < list.Length; ++i ) { MultiTileEntry mte = list[i]; - int itemID = mte.m_ItemID & 0x3FFF; + int itemID = mte.m_ItemID; if( itemID >= 0x181D && itemID < 0x1829 ) { @@ -1094,7 +1094,6 @@ namespace Server.Multis public static bool IsStairBlock( int id ) { - id &= 0x3FFF; int delta = -1; for( int i = 0; delta < 0 && i < m_BlockIDs.Length; ++i ) @@ -1108,7 +1107,6 @@ namespace Server.Multis public static bool IsStair( int id, ref int dir ) { //dir n=0 w=1 s=2 e=3 - id &= 0x3FFF; int delta = -4; for( int i = 0; delta < -3 && i < m_StairSeqs.Length; ++i ) @@ -1352,7 +1350,7 @@ namespace Server.Multis { MultiTileEntry entry = stairs.List[i]; - if( (entry.m_ItemID & 0x3FFF) != 1 ) + if( entry.m_ItemID != 1 ) mcl.Add( entry.m_ItemID, x + entry.m_OffsetX, y + entry.m_OffsetY, z + entry.m_OffsetZ ); } @@ -1862,8 +1860,6 @@ namespace Server.Multis public static bool IsFixture( int itemID ) { - itemID &= 0x3FFF; - if( itemID >= 0x675 && itemID < 0x6F5 ) return true; else if( itemID >= 0x314 && itemID < 0x364 ) diff --git a/Scripts/Multis/HousePlacementTool.cs b/Scripts/Multis/HousePlacementTool.cs index cb0e7a001..5e8440ed6 100644 --- a/Scripts/Multis/HousePlacementTool.cs +++ b/Scripts/Multis/HousePlacementTool.cs @@ -467,7 +467,7 @@ namespace Server.Items { MultiTileEntry entry = mcl.List[i]; - int itemID = entry.m_ItemID & 0x3FFF; + int itemID = entry.m_ItemID; if ( itemID >= 0xBA3 && itemID <= 0xC0E ) { @@ -563,7 +563,7 @@ namespace Server.Items { HousePlacementEntry e = (HousePlacementEntry)list[i]; - if ( e.m_MultiID == (house.ItemID & 0x3FFF) ) + if ( e.m_MultiID == house.ItemID ) return e; } } @@ -571,7 +571,7 @@ namespace Server.Items { Hashtable table = (Hashtable)obj; - obj = table[house.ItemID & 0x3FFF]; + obj = table[house.ItemID]; if ( obj is HousePlacementEntry ) return (HousePlacementEntry)obj; diff --git a/Scripts/Multis/PreviewHouse.cs b/Scripts/Multis/PreviewHouse.cs index 528779361..b08ad3a2e 100644 --- a/Scripts/Multis/PreviewHouse.cs +++ b/Scripts/Multis/PreviewHouse.cs @@ -23,7 +23,7 @@ namespace Server.Multis if ( entry.m_Flags == 0 ) { - Item item = new Static( entry.m_ItemID & 0x3FFF ); + Item item = new Static( entry.m_ItemID ); item.MoveToWorld( new Point3D( X + entry.m_OffsetX, Y + entry.m_OffsetY, Z + entry.m_OffsetZ ), Map ); diff --git a/Scripts/Regions/BaseRegion.cs b/Scripts/Regions/BaseRegion.cs index 9545a659d..226ce3598 100644 --- a/Scripts/Regions/BaseRegion.cs +++ b/Scripts/Regions/BaseRegion.cs @@ -309,7 +309,7 @@ namespace Server.Regions { Item item = sector.Items[j]; - if ( item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint( x, y ) ) + if ( !(item is BaseMulti) && item.AtWorldPoint( x, y ) ) { m_SpawnBuffer2.Add( item );