diff --git a/Scripts/Items/Misc/Blocker.cs b/Scripts/Items/Misc/Blocker.cs index 2d12785e5..71bd66677 100644 --- a/Scripts/Items/Misc/Blocker.cs +++ b/Scripts/Items/Misc/Blocker.cs @@ -18,17 +18,14 @@ namespace Server.Items { } - public override void SendInfoTo( NetState state ) - { + protected override Packet GetWorldPacketFor( NetState state ) { Mobile mob = state.Mobile; - if ( mob != null && mob.AccessLevel >= AccessLevel.GameMaster ) - state.Send( new GMItemPacket( this ) ); - else - state.Send( WorldPacket ); + if ( mob != null && mob.AccessLevel >= AccessLevel.GameMaster ) { + return new GMItemPacket( this ); + } - if ( ObjectPropertyList.Enabled ) - state.Send( OPLPacket ); + return base.GetWorldPacketFor( state ); } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Misc/Corpses/Corpse.cs b/Scripts/Items/Misc/Corpses/Corpse.cs index 3ddfeac5b..ebde64c15 100644 --- a/Scripts/Items/Misc/Corpses/Corpse.cs +++ b/Scripts/Items/Misc/Corpses/Corpse.cs @@ -545,9 +545,9 @@ namespace Server.Items } } - public override void SendInfoTo( NetState state ) + public override void SendInfoTo( NetState state, bool sendOplPacket ) { - base.SendInfoTo( state ); + base.SendInfoTo( state, sendOplPacket ); if ( ItemID == 0x2006 ) { diff --git a/Scripts/Items/Misc/LOSBlocker.cs b/Scripts/Items/Misc/LOSBlocker.cs index 1bf0b954d..076e673fa 100644 --- a/Scripts/Items/Misc/LOSBlocker.cs +++ b/Scripts/Items/Misc/LOSBlocker.cs @@ -27,17 +27,14 @@ namespace Server.Items { } - public override void SendInfoTo( NetState state ) - { + protected override Packet GetWorldPacketFor( NetState state ) { Mobile mob = state.Mobile; - if ( mob != null && mob.AccessLevel >= AccessLevel.GameMaster ) - state.Send( new GMItemPacket( this ) ); - else - state.Send( WorldPacket ); + if ( mob != null && mob.AccessLevel >= AccessLevel.GameMaster ) { + return new GMItemPacket( this ); + } - if ( ObjectPropertyList.Enabled ) - state.Send( OPLPacket ); + return base.GetWorldPacketFor( state ); } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Multis/HouseFoundation.cs b/Scripts/Multis/HouseFoundation.cs index 8c9753294..60d4def95 100644 --- a/Scripts/Multis/HouseFoundation.cs +++ b/Scripts/Multis/HouseFoundation.cs @@ -620,9 +620,9 @@ namespace Server.Multis DesignState.SendDetailedInfoTo( m.NetState ); } - public override void SendInfoTo( NetState state ) + public override void SendInfoTo( NetState state, bool sendOplPacket ) { - base.SendInfoTo( state ); + base.SendInfoTo( state, sendOplPacket ); DesignContext context = DesignContext.Find( state.Mobile ); DesignState stateToSend;