diff --git a/Scripts/Misc/Notoriety.cs b/Scripts/Misc/Notoriety.cs index e9233ee8e..f8d5b8697 100644 --- a/Scripts/Misc/Notoriety.cs +++ b/Scripts/Misc/Notoriety.cs @@ -85,7 +85,7 @@ namespace Server.Misc pmTarg = bcTarg.SummonMaster as PlayerMobile; } - if( pmFrom!= null && pmTarg != null ) + if( pmFrom != null && pmTarg != null ) { if( pmFrom.DuelContext != pmTarg.DuelContext && ((pmFrom.DuelContext != null && pmFrom.DuelContext.Started) || (pmTarg.DuelContext != null && pmTarg.DuelContext.Started)) ) return false; @@ -176,7 +176,7 @@ namespace Server.Misc pmTarg = bcTarg.SummonMaster as PlayerMobile; } - if( pmFrom!= null && pmTarg != null ) + if( pmFrom != null && pmTarg != null ) { if( pmFrom.DuelContext != pmTarg.DuelContext && ((pmFrom.DuelContext != null && pmFrom.DuelContext.Started) || (pmTarg.DuelContext != null && pmTarg.DuelContext.Started)) ) return false; diff --git a/Scripts/Skills/Stealing.cs b/Scripts/Skills/Stealing.cs index fdcf86abd..2d1c98c4f 100644 --- a/Scripts/Skills/Stealing.cs +++ b/Scripts/Skills/Stealing.cs @@ -59,6 +59,10 @@ namespace Server.SkillHandlers { m_Thief.SendLocalizedMessage( 1005584 ); // Both hands must be free to steal. } + else if ( m_Thief.Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) ) + { + m_Thief.SendMessage( "You may not steal in this area." ); + } else if ( root is Mobile && ((Mobile)root).Player && !IsInGuild( m_Thief ) ) { m_Thief.SendLocalizedMessage( 1005596 ); // You must be in the thieves guild to steal from other players. @@ -316,7 +320,9 @@ namespace Server.SkillHandlers { from.AddToBackpack( stolen ); - StolenItem.Add( stolen, m_Thief, root as Mobile ); + if ( !( stolen is Container || stolen.Stackable ) ) { // do not return stolen containers or stackable items + StolenItem.Add( stolen, m_Thief, root as Mobile ); + } } if ( caught ) @@ -377,6 +383,10 @@ namespace Server.SkillHandlers { m.SendLocalizedMessage( 1005584 ); // Both hands must be free to steal. } + else if ( m.Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) ) + { + m.SendMessage( "You may not steal in this area." ); + } else { m.Target = new Stealing.StealingTarget( m );