fix: Fixes targeting checks (#869)

* Adds CanTarget for more granular overrides of specific targeting restrictions
* Updates spell targeting
* Fixes targeting checks

Projects/UOContent/Spells/Fifth/DispelField.cs

@@ -1,6 +1,5 @@
 using Server.Items;
 using Server.Misc;
-using Server.Targeting;
 
 namespace Server.Spells.Fifth
 {

Projects/UOContent/Spells/Fifth/PoisonField.cs

@@ -3,7 +3,6 @@ using Server.Collections;
 using Server.Items;
 using Server.Misc;
 using Server.Mobiles;
-using Server.Targeting;
 
 namespace Server.Spells.Fifth
 {

Projects/UOContent/Spells/Fourth/ArchCure.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Server.Mobiles;
-using Server.Targeting;
 
 namespace Server.Spells.Fourth
 {

Projects/UOContent/Spells/Fourth/ArchProtection.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Server.Collections;
 using Server.Engines.PartySystem;
 using Server.Spells.Second;
-using Server.Targeting;
 
 namespace Server.Spells.Fourth
 {

Projects/UOContent/Spells/Fourth/FireField.cs

@@ -3,7 +3,6 @@ using Server.Collections;
 using Server.Items;
 using Server.Misc;
 using Server.Mobiles;
-using Server.Targeting;
 
 namespace Server.Spells.Fourth
 {

Projects/UOContent/Spells/Necromancy/AnimateDeadSpell.cs

@@ -4,7 +4,6 @@ using Server.Engines.Quests;
 using Server.Engines.Quests.Necro;
 using Server.Items;
 using Server.Mobiles;
-using Server.Targeting;
 using Server.Utilities;
 
 namespace Server.Spells.Necromancy

Projects/UOContent/Spells/Second/MagicTrap.cs

@@ -1,5 +1,4 @@
 using Server.Items;
-using Server.Targeting;
 
 namespace Server.Spells.Second
 {

Projects/UOContent/Spells/Second/RemoveTrap.cs

@@ -1,5 +1,4 @@
 using Server.Items;
-using Server.Targeting;
 
 namespace Server.Spells.Second
 {

Projects/UOContent/Spells/Seventh/ChainLightning.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Server.Targeting;
 
 namespace Server.Spells.Seventh
 {

Projects/UOContent/Spells/Seventh/EnergyField.cs

@@ -2,7 +2,6 @@ using System;
 using Server.Items;
 using Server.Misc;
 using Server.Mobiles;
-using Server.Targeting;
 
 namespace Server.Spells.Seventh
 {

Projects/UOContent/Spells/Seventh/MassDispel.cs

@@ -1,7 +1,6 @@
 using Server.Collections;
 using Server.Items;
 using Server.Mobiles;
-using Server.Targeting;
 
 namespace Server.Spells.Seventh
 {

Projects/UOContent/Spells/Seventh/MeteorSwarm.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Server.Targeting;
 
 namespace Server.Spells.Seventh
 {

Projects/UOContent/Spells/Sixth/Mark.cs

@@ -1,6 +1,5 @@
 using Server.Items;
 using Server.Network;
-using Server.Targeting;
 
 namespace Server.Spells.Sixth
 {

Projects/UOContent/Spells/Sixth/MassCurse.cs

@@ -1,5 +1,3 @@
-using Server.Targeting;
-
 namespace Server.Spells.Sixth
 {
     public class MassCurseSpell : MagerySpell, ISpellTargetingPoint3D

Projects/UOContent/Spells/Sixth/ParalyzeField.cs

@@ -2,7 +2,6 @@ using System;
 using Server.Items;
 using Server.Misc;
 using Server.Mobiles;
-using Server.Targeting;
 
 namespace Server.Spells.Sixth
 {

Projects/UOContent/Spells/Sixth/Reveal.cs

@@ -1,5 +1,4 @@
 using Server.Mobiles;
-using Server.Targeting;
 
 namespace Server.Spells.Sixth
 {

Projects/UOContent/Spells/Targeting/SpellTargetItem.cs

@@ -16,12 +16,12 @@ namespace Server.Spells
 
         public ISpell Spell => _spell;
 
+        protected override bool CanTarget(Mobile from, StaticTarget staticTarget, ref Point3D loc, ref Map map) => false;
+        protected override bool CanTarget(Mobile from, Mobile mobile, ref Point3D loc, ref Map map) => false;
+
         protected override void OnTarget(Mobile from, object o)
         {
-            if (o is Item item)
-            {
-                _spell.Target(item);
-            }
+            _spell.Target(o as Item);
         }
 
         protected override void OnTargetFinish(Mobile from)

Projects/UOContent/Spells/Targeting/SpellTargetMobile.cs

@@ -16,6 +16,9 @@ namespace Server.Spells
 
         public ISpell Spell => _spell;
 
+        protected override bool CanTarget(Mobile from, StaticTarget staticTarget, ref Point3D loc, ref Map map) => false;
+        protected override bool CanTarget(Mobile from, Item item, ref Point3D loc, ref Map map) => false;
+
         protected override void OnTarget(Mobile from, object o)
         {
             _spell.Target(o as Mobile);

Projects/UOContent/Spells/Targeting/SpellTargetPoint3D.cs

@@ -24,10 +24,7 @@ namespace Server.Spells
 
         protected override void OnTarget(Mobile from, object o)
         {
-            if (o is IPoint3D p)
-            {
-                _spell.Target(p);
-            }
+            _spell.Target(o as IPoint3D);
         }
 
         protected override void OnTargetOutOfLOS(Mobile from, object o)

Projects/UOContent/Spells/Third/MagicLock.cs

@@ -1,7 +1,6 @@
 using Server.Items;
 using Server.Multis;
 using Server.Network;
-using Server.Targeting;
 
 namespace Server.Spells.Third
 {

Projects/UOContent/Spells/Third/Telekinesis.cs

@@ -1,5 +1,4 @@
 using Server.Items;
-using Server.Targeting;
 
 namespace Server.Spells.Third
 {

Projects/UOContent/Spells/Third/Teleport.cs

@@ -5,7 +5,6 @@ using Server.Regions;
 using Server.Spells.Fifth;
 using Server.Spells.Fourth;
 using Server.Spells.Sixth;
-using Server.Targeting;
 
 namespace Server.Spells.Third
 {

Projects/UOContent/Spells/Third/Unlock.cs

@@ -1,7 +1,6 @@
 using Server.Items;
 using Server.Multis;
 using Server.Network;
-using Server.Targeting;
 
 namespace Server.Spells.Third
 {

Projects/UOContent/Spells/Third/WallOfStone.cs

@@ -1,7 +1,6 @@
 using System;
 using Server.Misc;
 using Server.Mobiles;
-using Server.Targeting;
 
 namespace Server.Spells.Third
 {