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

fix: Fixes young healing each other (#1345)

Browse source
This commit is contained in:
Kamron Batman 2023-02-21 18:15:57 -08:00 • committed by GitHub
parent 5fd0e94b7d
commit 95e55e994f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Projects/UOContent/Misc/Notoriety.cs
View file

@ -70,15 +70,17 @@ namespace Server.Misc
return true;
}
var bcFrom = from as BaseCreature;
var bcTarg = target as BaseCreature;
var pmFrom = from as PlayerMobile;
var pmTarg = target as PlayerMobile;
if (pmFrom == null && from is BaseCreature bcFrom && bcFrom.Summoned)
if (pmFrom == null && bcFrom?.Summoned == true)
{
pmFrom = bcFrom.SummonMaster as PlayerMobile;
}
if (pmTarg == null && target is BaseCreature bcTarg && bcTarg.Summoned)
if (pmTarg == null && bcTarg?.Summoned == true)
{
pmTarg = bcTarg.SummonMaster as PlayerMobile;
}
@ -131,12 +133,9 @@ namespace Server.Misc
var targetFaction = Faction.Find(target, true);
if ((!Core.ML || map == Faction.Facet) && targetFaction != null)
if ((!Core.ML || map == Faction.Facet) && targetFaction != null && Faction.Find(from, true) != targetFaction)
{
if (Faction.Find(from, true) != targetFaction)
{
return false;
}
return false;
}
if ((map?.Rules & MapRules.BeneficialRestrictions) == 0)
@ -149,12 +148,12 @@ namespace Server.Misc
return true; // NPCs have no restrictions
}
if (target is BaseCreature creature && !creature.Controlled)
if (bcTarg?.Controlled == false)
{
return false; // Players cannot heal uncontrolled mobiles
}
if (pmFrom?.Young == true || pmTarg?.Young == true)
if (pmFrom?.Young == true && pmTarg?.Young != true)
{
return false; // Young players cannot perform beneficial actions towards older players
}