From b0ef0d55e158a5f9a6633e0ff04646412349e928 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Thu, 2 Jul 2026 20:48:07 -0700 Subject: [PATCH] fix(throwing): guard return-throw effect against deleted/unmapped thrower Co-Authored-By: Claude Opus 4.8 (1M context) --- Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs b/Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs index da2ea4f38..ede039ef2 100644 --- a/Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs +++ b/Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs @@ -132,12 +132,12 @@ public abstract partial class BaseThrown : BaseRanged public virtual void Return(Mobile thrower, Mobile target, WorldLocation worldLocation) { - if (thrower == null) + if (thrower?.Deleted != false || thrower.Map == null || thrower.Map == Map.Internal) { return; } - if (target != null) + if (target?.Deleted == false) { target.MovingEffect(thrower, EffectID, 18, 1, false, false, Hue, 0); }