From 142f71c258223863cfa59e5043f2ffac6c7cdedf Mon Sep 17 00:00:00 2001 From: Mark Sturgill Date: Sat, 2 Nov 2013 11:06:47 -0700 Subject: [PATCH] additional ientity.deleted impl --- Scripts/Mobiles/Vendors/GenericBuy.cs | 7 +------ Scripts/Multis/BaseHouse.cs | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Scripts/Mobiles/Vendors/GenericBuy.cs b/Scripts/Mobiles/Vendors/GenericBuy.cs index e75eee80e..c466304ad 100644 --- a/Scripts/Mobiles/Vendors/GenericBuy.cs +++ b/Scripts/Mobiles/Vendors/GenericBuy.cs @@ -119,12 +119,7 @@ namespace Server.Mobiles private bool IsDeleted( IEntity obj ) { - if ( obj is Item ) - return ((Item)obj).Deleted; - else if ( obj is Mobile ) - return ((Mobile)obj).Deleted; - - return false; + return obj.Deleted; } public void DeleteDisplayEntity() diff --git a/Scripts/Multis/BaseHouse.cs b/Scripts/Multis/BaseHouse.cs index 069bfe6f2..107976fde 100644 --- a/Scripts/Multis/BaseHouse.cs +++ b/Scripts/Multis/BaseHouse.cs @@ -2433,7 +2433,7 @@ namespace Server.Multis { writer.Write( (Point3D) relEntity.RelativeLocation ); - if ( ( relEntity.Entity is Item && ((Item)relEntity.Entity).Deleted ) || ( relEntity.Entity is Mobile && ((Mobile)relEntity.Entity).Deleted ) ) + if (relEntity.Entity.Deleted) writer.Write( (int) Serial.MinusOne ); else writer.Write( (int) relEntity.Entity.Serial );