fix: Removes duplicative spell checks (#849)

Projects/Server/Targeting/Target.cs

@@ -164,36 +164,33 @@ namespace Server.Targeting
             {
                 OnTargetOutOfRange(from, targeted);
             }
-            else
+            else if (!from.CanSee(targeted))
             {
-                if (!from.CanSee(targeted))
+                OnCantSeeTarget(from, targeted);
-                {
+            }
-                    OnCantSeeTarget(from, targeted);
+            else if (CheckLOS && !from.InLOS(targeted))
-                }
+            {
-                else if (CheckLOS && !from.InLOS(targeted))
+                OnTargetOutOfLOS(from, targeted);
-                {
+            }
-                    OnTargetOutOfLOS(from, targeted);
+            else if (item?.InSecureTrade == true)
-                }
+            {
-                else if (item?.InSecureTrade == true)
+                OnTargetInSecureTrade(from, targeted);
-                {
+            }
-                    OnTargetInSecureTrade(from, targeted);
+            else if (item?.IsAccessibleTo(from) == false)
-                }
+            {
-                else if (item?.IsAccessibleTo(from) == false)
+                OnTargetNotAccessible(from, targeted);
-                {
+            }
-                    OnTargetNotAccessible(from, targeted);
+            else if (item?.CheckTarget(from, this, targeted) == false)
-                }
+            {
-                else if (item?.CheckTarget(from, this, targeted) == false)
+                OnTargetUntargetable(from, targeted);
-                {
+            }
-                    OnTargetUntargetable(from, targeted);
+            else if (mobile?.CheckTarget(from, this, mobile) == false)
-                }
+            {
-                else if (mobile?.CheckTarget(from, this, mobile) == false)
+                OnTargetUntargetable(from, mobile);
-                {
+            }
-                    OnTargetUntargetable(from, mobile);
+            else if (from.Region.OnTarget(from, this, targeted))
-                }
+            {
-                else if (from.Region.OnTarget(from, this, targeted))
+                OnTarget(from, targeted);
-                {
-                    OnTarget(from, targeted);
-                }
             }
 
             OnTargetFinish(from);

Projects/UOContent/Commands/Handlers.cs

@@ -7,11 +7,9 @@ using Server.Gumps;
 using Server.Items;
 using Server.Menus.ItemLists;
 using Server.Menus.Questions;
-using Server.Misc;
 using Server.Mobiles;
 using Server.Multis;
 using Server.Network;
-using Server.Saves;
 using Server.Spells;
 using Server.Targeting;
 using Server.Targets;

Projects/UOContent/Compression/TarArchive.cs

@@ -1,14 +1,9 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
-using System.Net;
 using System.Net.Http;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
 using Server.Buffers;
 
 namespace Server.Compression

Projects/UOContent/Compression/ZstdArchive.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;

Projects/UOContent/Spells/Eighth/Resurrection.cs

@@ -24,16 +24,7 @@ namespace Server.Spells.Eighth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (m == Caster)
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (m == Caster)
             {
                 Caster.SendLocalizedMessage(501039); // Thou can not resurrect thyself.
             }

Projects/UOContent/Spells/Fifth/DispelField.cs

@@ -25,15 +25,7 @@ namespace Server.Spells.Fifth
 
         public void Target(Item item)
         {
-            if (item == null)
+            if (!item.GetType().IsDefined(typeof(DispellableFieldAttribute), false))
-            {
-                Caster.SendLocalizedMessage(1005049); // That cannot be dispelled.
-            }
-            else if (!Caster.CanSee(item))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (!item.GetType().IsDefined(typeof(DispellableFieldAttribute), false))
             {
                 Caster.SendLocalizedMessage(1005049); // That cannot be dispelled.
             }

Projects/UOContent/Spells/Fifth/MindBlast.cs

@@ -30,16 +30,7 @@ namespace Server.Spells.Fifth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (Core.AOS)
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (Core.AOS)
             {
                 if (Caster.CanBeHarmful(m) && CheckSequence())
                 {

Projects/UOContent/Spells/Fifth/Paralyze.cs

@@ -25,17 +25,7 @@ namespace Server.Spells.Fifth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (Core.AOS && (m.Frozen || m.Paralyzed || m.Spell?.IsCasting == true && m.Spell is not PaladinSpell))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (Core.AOS && (m.Frozen || m.Paralyzed ||
-                                  m.Spell?.IsCasting == true && !(m.Spell is PaladinSpell)))
             {
                 Caster.SendLocalizedMessage(1061923); // The target is already frozen.
             }

Projects/UOContent/Spells/Fifth/PoisonField.cs

@@ -28,11 +28,7 @@ namespace Server.Spells.Fifth
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/First/Clumsy.cs

@@ -21,16 +21,7 @@ namespace Server.Spells.First
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/First/Feeblemind.cs

@@ -21,16 +21,7 @@ namespace Server.Spells.First
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/First/Heal.cs

@@ -26,16 +26,7 @@ namespace Server.Spells.First
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (m.IsDeadBondedPet)
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (m.IsDeadBondedPet)
             {
                 Caster.SendLocalizedMessage(1060177); // You cannot heal a creature that is already dead!
             }

Projects/UOContent/Spells/First/MagicArrow.cs

@@ -24,16 +24,7 @@ namespace Server.Spells.First
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 var source = Caster;
 

Projects/UOContent/Spells/First/Weaken.cs

@@ -21,16 +21,7 @@ namespace Server.Spells.First
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Fourth/ArchCure.cs

@@ -29,11 +29,7 @@ namespace Server.Spells.Fourth
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Fourth/ArchProtection.cs

@@ -30,11 +30,7 @@ namespace Server.Spells.Fourth
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Fourth/Curse.cs

@@ -25,16 +25,7 @@ namespace Server.Spells.Fourth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 
@@ -46,8 +37,8 @@ namespace Server.Spells.Fourth
                 SpellHelper.AddStatCurse(Caster, m, StatType.Int);
                 SpellHelper.DisableSkillCheck = false;
 
-                if (Caster.Player && m.Player /*&& Caster != m */ && !UnderEffect(m)
+                // On OSI you CAN curse yourself and get this effect.
-                ) // On OSI you CAN curse yourself and get this effect.
+                if (Caster.Player && m.Player /*&& Caster != m */ && !UnderEffect(m))
                 {
                     var duration = SpellHelper.GetDuration(Caster, m);
                     m_UnderEffect.Add(m);

Projects/UOContent/Spells/Fourth/FireField.cs

@@ -28,11 +28,7 @@ namespace Server.Spells.Fourth
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Fourth/GreaterHeal.cs

@@ -27,16 +27,7 @@ namespace Server.Spells.Fourth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (m is BaseCreature creature && creature.IsAnimatedDead)
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (m is BaseCreature creature && creature.IsAnimatedDead)
             {
                 Caster.SendLocalizedMessage(1061654); // You cannot heal that which is not alive.
             }

Projects/UOContent/Spells/Fourth/Lightning.cs

@@ -23,16 +23,7 @@ namespace Server.Spells.Fourth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Fourth/ManaDrain.cs

@@ -26,16 +26,7 @@ namespace Server.Spells.Fourth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Mysticism/SpellPlagueSpell.cs

@@ -41,11 +41,7 @@ namespace Server.Spells.Mysticism
 
         public void Target(Mobile targeted)
         {
-            if (!Caster.CanSee(targeted))
+            if (CheckHSequence(targeted))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(targeted))
             {
                 SpellHelper.Turn(Caster, targeted);
 

Projects/UOContent/Spells/Second/Agility.cs

@@ -22,16 +22,7 @@ namespace Server.Spells.Second
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckBSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckBSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Second/Cunning.cs

@@ -22,16 +22,7 @@ namespace Server.Spells.Second
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckBSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckBSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Second/Cure.cs

@@ -22,16 +22,7 @@ namespace Server.Spells.Second
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckBSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckBSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Second/Harm.cs

@@ -23,16 +23,7 @@ namespace Server.Spells.Second
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Second/MagicTrap.cs

@@ -27,10 +27,6 @@ namespace Server.Spells.Second
             {
                 Caster.SendLocalizedMessage(502942); // You can't trap this!
             }
-            else if (!Caster.CanSee(item))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
             else if (cont.TrapType != TrapType.None && cont.TrapType != TrapType.MagicTrap)
             {
                 DoFizzle();

Projects/UOContent/Spells/Second/RemoveTrap.cs

@@ -22,13 +22,9 @@ namespace Server.Spells.Second
 
         public void Target(Item item)
         {
-            if (!(item is TrappableContainer cont))
+            if (item is not TrappableContainer cont)
             {
-                Caster.SendMessage("You can't disarm that"); // TODO: Localization?
+                Caster.SendLocalizedMessage(502373); // That doesn't appear to be trapped
-            }
-            else if (!Caster.CanSee(item))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
             }
             else if (cont.TrapType != TrapType.None && cont.TrapType != TrapType.MagicTrap)
             {

Projects/UOContent/Spells/Second/Strength.cs

@@ -22,16 +22,7 @@ namespace Server.Spells.Second
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckBSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckBSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Seventh/ChainLightning.cs

@@ -28,11 +28,7 @@ namespace Server.Spells.Seventh
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Seventh/EnergyField.cs

@@ -28,11 +28,7 @@ namespace Server.Spells.Seventh
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Seventh/FlameStrike.cs

@@ -23,16 +23,7 @@ namespace Server.Spells.Seventh
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Seventh/ManaVampire.cs

@@ -24,16 +24,7 @@ namespace Server.Spells.Seventh
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Seventh/MassDispel.cs

@@ -25,11 +25,7 @@ namespace Server.Spells.Seventh
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Seventh/MeteorSwarm.cs

@@ -28,11 +28,7 @@ namespace Server.Spells.Seventh
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Sixth/Dispel.cs

@@ -24,16 +24,7 @@ namespace Server.Spells.Sixth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (m is not BaseCreature { IsDispellable: true } bc)
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (!(m is BaseCreature bc && bc.IsDispellable))
             {
                 Caster.SendLocalizedMessage(1005049); // That cannot be dispelled.
             }

Projects/UOContent/Spells/Sixth/EnergyBolt.cs

@@ -23,16 +23,7 @@ namespace Server.Spells.Sixth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 var source = Caster;
 

Projects/UOContent/Spells/Sixth/Explosion.cs

@@ -26,16 +26,7 @@ namespace Server.Spells.Sixth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (Caster.CanBeHarmful(m) && CheckSequence())
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (Caster.CanBeHarmful(m) && CheckSequence())
             {
                 Mobile attacker = Caster, defender = m;
 

Projects/UOContent/Spells/Sixth/Invisibility.cs

@@ -28,16 +28,7 @@ namespace Server.Spells.Sixth
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (m is BaseVendor or PlayerVendor || m.AccessLevel > Caster.AccessLevel)
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (m is BaseVendor || m is PlayerVendor || m.AccessLevel > Caster.AccessLevel)
             {
                 Caster.SendLocalizedMessage(501857); // This spell won't work on that!
             }

Projects/UOContent/Spells/Sixth/Mark.cs

@@ -24,7 +24,7 @@ namespace Server.Spells.Sixth
 
         public void Target(Item item)
         {
-            if (!(item is RecallRune rune))
+            if (item is not RecallRune rune)
             {
                 Caster.NetState.SendMessageLocalized(
                     Caster.Serial,
@@ -32,13 +32,9 @@ namespace Server.Spells.Sixth
                     MessageType.Regular,
                     0x3B2,
                     3,
-                    501797,
+                    501797, // I cannot mark that object.
                     Caster.Name
-                ); // I cannot mark that object.
+                );
-            }
-            else if (!Caster.CanSee(rune))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
             }
             else if (!SpellHelper.CheckTravel(Caster, TravelCheckType.Mark))
             {
@@ -49,11 +45,8 @@ namespace Server.Spells.Sixth
             }
             else if (!rune.IsChildOf(Caster.Backpack))
             {
-                Caster.LocalOverheadMessage(
+                // You must have this rune in your backpack in order to mark it.
-                    MessageType.Regular,
+                Caster.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1062422);
-                    0x3B2,
-                    1062422
-                ); // You must have this rune in your backpack in order to mark it.
             }
             else if (CheckSequence())
             {

Projects/UOContent/Spells/Sixth/MassCurse.cs

@@ -24,11 +24,7 @@ namespace Server.Spells.Sixth
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Sixth/ParalyzeField.cs

@@ -27,11 +27,7 @@ namespace Server.Spells.Sixth
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
 

Projects/UOContent/Spells/Sixth/Reveal.cs

@@ -22,11 +22,7 @@ namespace Server.Spells.Sixth
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);
                 SpellHelper.GetSurfaceTop(ref p);

Projects/UOContent/Spells/Spellweaving/GiftOfLife.cs

@@ -30,15 +30,7 @@ namespace Server.Spells.Spellweaving
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (m.IsDeadBondedPet || !m.Alive)
-            {
-                Caster.SendLocalizedMessage(1072077); // You may only cast this spell on yourself or a bonded pet.
-            }
-            else if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (m.IsDeadBondedPet || !m.Alive)
             {
                 // As per Osi: Nothing happens.
             }

Projects/UOContent/Spells/Spellweaving/GiftOfRenewal.cs

@@ -26,16 +26,7 @@ namespace Server.Spells.Spellweaving
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (m_Table.ContainsKey(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (m_Table.ContainsKey(m))
             {
                 Caster.SendLocalizedMessage(501775); // This spell is already in effect.
             }

Projects/UOContent/Spells/Spellweaving/WordOfDeath.cs

@@ -18,16 +18,7 @@ namespace Server.Spells.Spellweaving
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 var loc = m.Location;
                 loc.Z += 50;

Projects/UOContent/Spells/Third/Bless.cs

@@ -22,16 +22,7 @@ namespace Server.Spells.Third
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckBSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckBSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Third/Fireball.cs

@@ -22,16 +22,7 @@ namespace Server.Spells.Third
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 var source = Caster;
 

Projects/UOContent/Spells/Third/Poison.cs

@@ -21,16 +21,7 @@ namespace Server.Spells.Third
 
         public void Target(Mobile m)
         {
-            if (m == null)
+            if (CheckHSequence(m))
-            {
-                return;
-            }
-
-            if (!Caster.CanSee(m))
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (CheckHSequence(m))
             {
                 SpellHelper.Turn(Caster, m);
 

Projects/UOContent/Spells/Third/WallOfStone.cs

@@ -25,11 +25,7 @@ namespace Server.Spells.Third
 
         public void Target(IPoint3D p)
         {
-            if (!Caster.CanSee(p))
+            if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
-            {
-                Caster.SendLocalizedMessage(500237); // Target can not be seen.
-            }
-            else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
             {
                 SpellHelper.Turn(Caster, p);