From 160e9a33bc0a4772893c4ec8dd039e5cd47c3915 Mon Sep 17 00:00:00 2001 From: deccer Date: Thu, 24 Sep 2020 19:37:52 +0400 Subject: [PATCH] Fix switch-expression related error message (#264) Bumps release version --- Projects/UOContent/Engines/ConPVP/DuelContext.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Projects/UOContent/Engines/ConPVP/DuelContext.cs b/Projects/UOContent/Engines/ConPVP/DuelContext.cs index d7f5d6634..11abf248e 100644 --- a/Projects/UOContent/Engines/ConPVP/DuelContext.cs +++ b/Projects/UOContent/Engines/ConPVP/DuelContext.cs @@ -2073,8 +2073,8 @@ namespace Server.Engines.ConPVP int number = item switch { BaseWeapon _ => 1062001, // You can no longer wield your ~1_WEAPON~ - BaseShield _ => 1062003, // You can no longer equip your ~1_SHIELD~ - _ when item is BaseArmor || item is BaseClothing => 1062002 // You can no longer wear your ~1_ARMOR~ + _ when !(item is BaseShield) && (item is BaseArmor || item is BaseClothing) => 1062002, // You can no longer wear your ~1_ARMOR~ + _ => 1062003 // You can no longer equip your ~1_SHIELD~ }; mob.SendLocalizedMessage(number, item.Name ?? $"#{item.LabelNumber}");