From c1af2ade833581ff1008205db7050132d4b06cc1 Mon Sep 17 00:00:00 2001 From: Bohica <53943479+Bohicatv@users.noreply.github.com> Date: Wed, 16 Jul 2025 21:34:43 -0700 Subject: [PATCH] fix: Fixes pet validation for resurrection spell (#2197) --- Projects/UOContent/Spells/Eighth/Resurrection.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Projects/UOContent/Spells/Eighth/Resurrection.cs b/Projects/UOContent/Spells/Eighth/Resurrection.cs index f4c6b686e..689ddc3d5 100644 --- a/Projects/UOContent/Spells/Eighth/Resurrection.cs +++ b/Projects/UOContent/Spells/Eighth/Resurrection.cs @@ -1,6 +1,7 @@ using Server.Engines.ConPVP; using Server.Gumps; using Server.Targeting; +using Server.Mobiles; namespace Server.Spells.Eighth { @@ -30,22 +31,22 @@ namespace Server.Spells.Eighth { Caster.SendLocalizedMessage(501039); // Thou can not resurrect thyself. } - else if (!Caster.Alive) + else if (m is BaseCreature { IsDeadBondedPet: true }) { - Caster.SendLocalizedMessage(501040); // The resurrecter must be alive. + Caster.SendMessage("Target can not be revived this way."); + } + else if (!m.Player) + { + Caster.SendLocalizedMessage(501043); // Target is not a being. } else if (m.Alive) { Caster.SendLocalizedMessage(501041); // Target is not dead. } - else if (!Caster.InRange(m, 1)) + else if (!Caster.InRange(m, TargetRange)) { Caster.SendLocalizedMessage(501042); // Target is not close enough. } - else if (!m.Player) - { - Caster.SendLocalizedMessage(501043); // Target is not a being. - } else if (m.Map?.CanFit(m.Location, 16, false, false) != true) { Caster.SendLocalizedMessage(501042); // Target can not be resurrected at that location.