From 11e1b425d9ead9ce5bc0863b6fedb90647a5a16f Mon Sep 17 00:00:00 2001 From: sp1r17 Date: Sun, 17 Sep 2023 19:24:59 -0500 Subject: [PATCH] fix: Hireables should not drop their pack (#1503) --- Projects/UOContent/Mobiles/AI/BaseAI.cs | 6 +++++- Projects/UOContent/Mobiles/Hireables/BaseHire.cs | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Projects/UOContent/Mobiles/AI/BaseAI.cs b/Projects/UOContent/Mobiles/AI/BaseAI.cs index 0cae96dc3..69489d798 100644 --- a/Projects/UOContent/Mobiles/AI/BaseAI.cs +++ b/Projects/UOContent/Mobiles/AI/BaseAI.cs @@ -1762,7 +1762,11 @@ public abstract class BaseAI } m_Mobile.BeginDeleteTimer(); - m_Mobile.DropBackpack(); + + if (m_Mobile.CanDrop) + { + m_Mobile.DropBackpack(); + } return true; } diff --git a/Projects/UOContent/Mobiles/Hireables/BaseHire.cs b/Projects/UOContent/Mobiles/Hireables/BaseHire.cs index af3156b79..d7c3d29fc 100644 --- a/Projects/UOContent/Mobiles/Hireables/BaseHire.cs +++ b/Projects/UOContent/Mobiles/Hireables/BaseHire.cs @@ -49,6 +49,9 @@ public partial class BaseHire : BaseCreature public override bool IsBondable => false; public override bool KeepsItemsOnDeath => true; + // Ensure we cannot drop if we are a hireable + public override bool CanDrop => false; + [AfterDeserialization] private void AfterDeserialization() {