warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Scripts/Misc/Notoriety.cs
View file

@ -105,14 +105,9 @@ namespace Server.Misc
pmTarg?.DuelContext != null && pmTarg.DuelContext.Started)
return false;
if (from.Region.GetRegion(typeof(SafeZone)) is SafeZone sz /*&& sz.IsDisabled()*/)
if (from.Region.IsPartOf<SafeZone>() || target.Region.IsPartOf<SafeZone>())
return false;
sz = target.Region.GetRegion(typeof(SafeZone)) as SafeZone;
if (sz != null /*&& sz.IsDisabled()*/)
return false;
#endregion
Map map = from.Map;
@ -191,12 +186,7 @@ namespace Server.Misc
pmTarg?.DuelContext != null && pmTarg.DuelContext.Started)
return false;
if (from.Region.GetRegion(typeof(SafeZone)) is SafeZone sz /*&& sz.IsDisabled()*/)
return false;
sz = target.Region.GetRegion(typeof(SafeZone)) as SafeZone;
if (sz != null /*&& sz.IsDisabled()*/)
if (from.Region.IsPartOf<SafeZone>() || target.Region.IsPartOf<SafeZone>())
return false;
#endregion
@ -408,7 +398,7 @@ namespace Server.Misc
if (bcTarg?.InitialInnocent != true)
if (!target.Body.IsHuman && !target.Body.IsGhost && !IsPet(bcTarg) && pmTarg == null ||
!Core.ML && !target.CanBeginAction(typeof(PolymorphSpell)))
!Core.ML && !target.CanBeginAction<PolymorphSpell>())
return Notoriety.CanBeAttacked;
if (CheckAggressor(source.Aggressors, target))