diff --git a/Scripts/Commands/Wipe.cs b/Scripts/Commands/Wipe.cs index a5fb11cca..259e65fbf 100644 --- a/Scripts/Commands/Wipe.cs +++ b/Scripts/Commands/Wipe.cs @@ -77,17 +77,17 @@ namespace Server.Commands IPooledEnumerable eable; - if ((items || multis) && mobiles) - eable = map.GetObjectsInBounds(rect, items || multis, mobiles); - else + if (!items && !multis || !mobiles) return; + + eable = map.GetObjectsInBounds(rect, true, true); foreach (IEntity obj in eable) if (items && obj is Item && !(obj is BaseMulti || obj is HouseSign)) toDelete.Add(obj); else if (multis && obj is BaseMulti) toDelete.Add(obj); - else if (mobiles && obj is Mobile mobile && !mobile.Player) + else if (obj is Mobile mobile && !mobile.Player) toDelete.Add(mobile); eable.Free(); diff --git a/Scripts/Engines/BulkOrders/Books/BOBGump.cs b/Scripts/Engines/BulkOrders/Books/BOBGump.cs index 0ac06410f..12cb1cecd 100644 --- a/Scripts/Engines/BulkOrders/Books/BOBGump.cs +++ b/Scripts/Engines/BulkOrders/Books/BOBGump.cs @@ -549,7 +549,7 @@ namespace Server.Engines.BulkOrders if (item != null) { Container pack = m_From.Backpack; - if (pack == null || pack != null && !pack.CheckHold(m_From, item, true, true, 0, + if (pack == null || !pack.CheckHold(m_From, item, true, true, 0, item.PileWeight + item.TotalWeight)) { m_From.SendLocalizedMessage(503204); // You do not have room in your backpack for this diff --git a/Scripts/Engines/BulkOrders/Books/BODBuyGump.cs b/Scripts/Engines/BulkOrders/Books/BODBuyGump.cs index dc4acf393..64e232682 100644 --- a/Scripts/Engines/BulkOrders/Books/BODBuyGump.cs +++ b/Scripts/Engines/BulkOrders/Books/BODBuyGump.cs @@ -86,7 +86,7 @@ namespace Server.Engines.BulkOrders Container pack = m_From.Backpack; - if (pack == null || pack != null && !pack.CheckHold(m_From, item, true, true, 0, + if (pack == null || !pack.CheckHold(m_From, item, true, true, 0, item.PileWeight + item.TotalWeight)) { pv.SayTo(m_From, 503204); // You do not have room in your backpack for this @@ -94,7 +94,7 @@ namespace Server.Engines.BulkOrders } else { - if (pack != null && pack.ConsumeTotal(typeof(Gold), price) || Banker.Withdraw(m_From, price)) + if (pack.ConsumeTotal(typeof(Gold), price) || Banker.Withdraw(m_From, price)) { m_Book.Entries.Remove(m_Object); m_Book.InvalidateProperties(); diff --git a/Scripts/Engines/Chat/Chat.cs b/Scripts/Engines/Chat/Chat.cs index 6bb570bc6..21ba2c493 100644 --- a/Scripts/Engines/Chat/Chat.cs +++ b/Scripts/Engines/Chat/Chat.cs @@ -53,14 +53,14 @@ namespace Server.Engines.Chat accountChatName = accountChatName?.Trim(); - if (accountChatName != null && accountChatName.Length > 0) + if (!string.IsNullOrEmpty(accountChatName)) { if (chatName.Length > 0 && chatName != accountChatName) from.SendMessage("You cannot change chat nickname once it has been set."); } else { - if (chatName == null || chatName.Length == 0) + if (chatName.Length == 0) { SendCommandTo(from, ChatCommand.AskNewNickname); return; diff --git a/Scripts/Engines/ConPVP/Games/BombingRun.cs b/Scripts/Engines/ConPVP/Games/BombingRun.cs index 29e3e3a0f..027e8c1b6 100644 --- a/Scripts/Engines/ConPVP/Games/BombingRun.cs +++ b/Scripts/Engines/ConPVP/Games/BombingRun.cs @@ -1609,16 +1609,16 @@ namespace Server.Engines.ConPVP Item[] bombs = corpse.FindItemsByType(typeof(BRBomb), false); for (int i = 0; i < bombs.Length; ++i) - (bombs[i] as BRBomb).DropTo(mob, killer); + (bombs[i] as BRBomb)?.DropTo(mob, killer); - hadBomb = hadBomb || bombs.Length > 0; + hadBomb = bombs.Length > 0; if (mob.Backpack != null) { bombs = mob.Backpack.FindItemsByType(typeof(BRBomb), false); for (int i = 0; i < bombs.Length; ++i) - (bombs[i] as BRBomb).DropTo(mob, killer); + (bombs[i] as BRBomb)?.DropTo(mob, killer); hadBomb = hadBomb || bombs.Length > 0; } diff --git a/Server/Items/Container.cs b/Server/Items/Container.cs index 4c0291b9d..1db59536f 100644 --- a/Server/Items/Container.cs +++ b/Server/Items/Container.cs @@ -1081,17 +1081,7 @@ namespace Server.Items return -1; } - public int ConsumeTotal(Type[][] types, int[] amounts) - { - return ConsumeTotal(types, amounts, true, null); - } - - public int ConsumeTotal(Type[][] types, int[] amounts, bool recurse) - { - return ConsumeTotal(types, amounts, recurse, null); - } - - public int ConsumeTotal(Type[][] types, int[] amounts, bool recurse, OnItemConsumed callback) + public int ConsumeTotal(Type[][] types, int[] amounts, bool recurse = true, OnItemConsumed callback = null) { if (types.Length != amounts.Length) throw new ArgumentException(); @@ -1507,12 +1497,7 @@ namespace Server.Items #region Non-Generic FindItem[s] by Type - public Item[] FindItemsByType(Type type) - { - return FindItemsByType(type, true); - } - - public Item[] FindItemsByType(Type type, bool recurse) + public Item[] FindItemsByType(Type type, bool recurse = true) { if (m_FindItemsList.Count > 0) m_FindItemsList.Clear();