fix: avoid jackpots on changed slot collection sizes

Author: pandinocoder

Intersect (Core)/Collections/Slotting/ISlot.cs

@@ -0,0 +1,11 @@
+namespace Intersect.Collections.Slotting;
+
+
+public interface ISlot
+{
+
+    int Slot { get; }
+
+    bool IsEmpty { get; }
+
+}

Intersect (Core)/Collections/Slotting/SlotList.cs

@@ -0,0 +1,101 @@
+using System.Collections;
+
+namespace Intersect.Collections.Slotting;
+
+public class SlotList<TSlot> : IList<TSlot> where TSlot : ISlot
+{
+    private readonly SortedList<int, TSlot> _slots;
+    private readonly Func<int, TSlot> _factory;
+
+    public SlotList(int capacity, Func<int, TSlot> factory)
+    {
+        _slots = new SortedList<int, TSlot>(capacity);
+        _factory = factory;
+    }
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+    public IEnumerator<TSlot> GetEnumerator() => _slots.Values.GetEnumerator();
+
+    public void Add(TSlot slot)
+    {
+        if (_slots.TryGetValue(slot.Slot, out var existingSlot))
+        {
+            if (existingSlot.IsEmpty)
+            {
+                _slots[slot.Slot] = slot;
+            }
+            else
+            {
+                throw new ArgumentException($"Slot {slot.Slot} is already filled with a non-empty slot.", nameof(slot));
+            }
+        }
+        else
+        {
+            _slots.Add(slot.Slot, slot);
+        }
+    }
+
+    public void Clear() => _slots.Clear();
+
+    public bool Contains(TSlot slot) => _slots.ContainsValue(slot);
+
+    public void CopyTo(TSlot[] array, int arrayIndex) =>
+        _slots.Select(kvp => kvp.Value).ToArray().CopyTo(array, arrayIndex);
+
+    public bool Remove(TSlot slot) => _slots.Remove(slot.Slot);
+
+    public int Capacity
+    {
+        get => _slots.Capacity;
+        set => _slots.Capacity = value;
+    }
+
+    public int Count => _slots.Count;
+
+    public bool IsReadOnly => ((IDictionary)_slots).IsReadOnly;
+
+    public int IndexOf(TSlot slot) => _slots.IndexOfValue(slot);
+
+    public void Insert(int slotIndex, TSlot slot)
+    {
+        if (slotIndex != slot.Slot)
+        {
+            throw new ArgumentException($"Tried to insert slot {slot.Slot} to slot index {slotIndex}", nameof(slotIndex));
+        }
+
+        _slots.Add(slotIndex, slot);
+    }
+
+    public void RemoveAt(int slotIndex) => _slots.Remove(slotIndex);
+
+    public TSlot this[int slotIndex]
+    {
+        get
+        {
+            if (_slots.TryGetValue(slotIndex, out var slot))
+            {
+                return slot;
+            }
+
+            slot = _factory(slotIndex);
+            _slots[slotIndex] = slot;
+            return slot;
+        }
+        set => _slots[slotIndex] = value;
+    }
+
+    public int FindIndex(Func<TSlot, bool> predicate)
+    {
+        var copy = this.ToArray();
+        for (var index = 0; index < copy.Length; ++index)
+        {
+            if (predicate(copy[index]))
+            {
+                return index;
+            }
+        }
+
+        return -1;
+    }
+}

Intersect (Core)/Config/Options.cs

@@ -119,8 +119,6 @@ public static ushort ServerPort
 
     public static int MaxInvItems => Instance.PlayerOpts.MaxInventory;
 
-    public static int MaxPlayerSkills => Instance.PlayerOpts.MaxSpells;
-
     public static int MaxCharacters => Instance.PlayerOpts.MaxCharacters;
 
     public static int ItemDropChance => Instance.PlayerOpts.ItemDropChance;

Intersect.Client.Core/Entities/Entity.cs

@@ -173,7 +173,7 @@ public Guid SpellCast
         }
     }
 
-    public Spell[] Spells { get; set; } = new Spell[Options.MaxPlayerSkills];
+    public Spell[] Spells { get; set; } = new Spell[Options.Instance.PlayerOpts.MaxSpells];
 
     IReadOnlyList<Guid> IEntity.Spells => Spells.Select(x => x.Id).ToList();
 
@@ -233,7 +233,7 @@ public Entity(Guid id, EntityPacket? packet, EntityType entityType)
                 Inventory[i] = new Item();
             }
 
-            for (var i = 0; i < Options.MaxPlayerSkills; i++)
+            for (var i = 0; i < Options.Instance.PlayerOpts.MaxSpells; i++)
             {
                 Spells[i] = new Spell();
             }

Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs

@@ -86,7 +86,7 @@ void pnl_RightClicked(Base sender, ClickedEventArgs arguments)
         else
         {
             Globals.Me.TryForgetSpell(mYindex);
-        }   
+        }
     }
 
     void pnl_HoverLeave(Base sender, EventArgs arguments)
@@ -263,7 +263,7 @@ public void Update()
                 //Check spell first.
                 if (mSpellWindow.RenderBounds().IntersectsWith(dragRect))
                 {
-                    for (var i = 0; i < Options.MaxInvItems; i++)
+                    for (var i = 0; i < Options.Instance.PlayerOpts.MaxSpells; i++)
                     {
                         if (i < mSpellWindow.Items.Count &&
                             mSpellWindow.Items[i].RenderBounds().IntersectsWith(dragRect))

Intersect.Client.Core/Interface/Game/Spells/SpellsWindow.cs

@@ -120,7 +120,7 @@ public void Update()
 
         X = mSpellWindow.X;
         Y = mSpellWindow.Y;
-        for (var i = 0; i < Options.MaxPlayerSkills; i++)
+        for (var i = 0; i < Options.Instance.PlayerOpts.MaxSpells; i++)
         {
             var spell = SpellBase.Get(Globals.Me.Spells[i].Id);
             Items[i].Pnl.IsHidden = spell == null || Items[i].IsDragging;
@@ -133,7 +133,7 @@ public void Update()
 
     private void InitItemContainer()
     {
-        for (var i = 0; i < Options.MaxPlayerSkills; i++)
+        for (var i = 0; i < Options.Instance.PlayerOpts.MaxSpells; i++)
         {
             Items.Add(new SpellItem(this, i));
             Items[i].Container = new ImagePanel(mItemContainer, "Spell");

Intersect.Server.Core/Database/DbInterface.cs

@@ -522,8 +522,7 @@ public static Player GetUserCharacter(User user, Guid playerId, bool explicitLoa
             try
             {
                 using var playerContext = CreatePlayerContext(readOnly: true, explicitLoad: false);
-                player.LoadRelationships(playerContext);
-                _ = Player.Validate(player);
+                _ = player.LoadRelationships(playerContext);
             }
             catch (Exception exception)
             {

Intersect.Server.Core/Database/Item.cs

@@ -10,7 +10,7 @@
 
 namespace Intersect.Server.Database;
 
-public class Item: IItem
+public class Item : IItem
 {
     [JsonIgnore][NotMapped] public double DropChance { get; set; } = 100;
 

Intersect.Server.Core/Database/PlayerData/Players/BagSlot.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations.Schema;
-
+using Intersect.Collections.Slotting;
 using Newtonsoft.Json;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Local
@@ -23,12 +23,13 @@ public BagSlot(int slot)
     [DatabaseGenerated(DatabaseGeneratedOption.Identity), JsonIgnore]
     public Guid Id { get; private set; }
 
+    public bool IsEmpty => ItemId == default;
+
     [JsonIgnore]
     public Guid ParentBagId { get; private set; }
 
     [JsonIgnore]
     public virtual Bag ParentBag { get; private set; }
 
     public int Slot { get; private set; }
-
 }

Intersect.Server.Core/Database/PlayerData/Players/BankSlot.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations.Schema;
-
+using Intersect.Collections.Slotting;
 using Intersect.Server.Entities;
 
 using Newtonsoft.Json;
@@ -12,6 +12,7 @@ namespace Intersect.Server.Database.PlayerData.Players;
 
 public partial class BankSlot : Item, ISlot, IPlayerOwned
 {
+    public static BankSlot Create(int slotIndex) => new(slotIndex);
 
     public BankSlot()
     {
@@ -25,6 +26,8 @@ public BankSlot(int slot)
     [DatabaseGenerated(DatabaseGeneratedOption.Identity), JsonIgnore]
     public Guid Id { get; private set; }
 
+    public bool IsEmpty => ItemId == default;
+
     [JsonIgnore]
     public Guid PlayerId { get; private set; }