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

#W# Confict: Fixed BaseCreature git merge conflict.

Browse source
This commit is contained in:
WarrentyExpired 2026-10-10 23:17:41 -04:00
commit ad38314ca7
112 changed files with 5397 additions and 616 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -1698,12 +1698,12 @@ public abstract partial class BaseWeapon
return 0;
}
if (attacker is not BaseCreature bc || bc.PackInstinct == PackInstinct.None || !bc.Controlled && !bc.Summoned)
if (attacker is not BaseCreature bc || bc.PackInstinct == PackInstinct.None)
{
return 0;
}
var master = bc.ControlMaster ?? bc.SummonMaster;
var master = bc.GetMaster();
if (master == null)
{
@ -1713,8 +1713,7 @@ public abstract partial class BaseWeapon
var inPack = 1;
foreach (var m in defender.GetMobilesInRange<BaseCreature>(1))
{
if (m != attacker && (m.PackInstinct & bc.PackInstinct) != 0 && (m.Controlled || m.Summoned) &&
master == (m.ControlMaster ?? m.SummonMaster) && m.Combatant == defender)
if (m != attacker && (m.PackInstinct & bc.PackInstinct) != 0 && master == m.GetMaster() && m.Combatant == defender)
{
inPack++;
}
@ -1736,7 +1735,7 @@ public abstract partial class BaseWeapon
{
foreach (var m in defender.GetMobilesInRange<Clone>(4))
{
if (m?.Summoned == true && m.SummonMaster == defender)
if (m?.SummonMaster == defender)
{
// Your attack has been diverted to a nearby mirror image of your target!
attacker.SendLocalizedMessage(1063141);
@ -2100,7 +2099,7 @@ public abstract partial class BaseWeapon
if (attacker is VampireBatFamiliar bc)
{
var caster = bc.ControlMaster ?? bc.SummonMaster;
var caster = bc.GetMaster();
if (caster != null && caster.Map == bc.Map && caster.InRange(bc, 2))
{