From 2fb6331d7b2da8d09d0d4e158c702e92df609eb8 Mon Sep 17 00:00:00 2001
From: Bolton <48883340+BoltonDev@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:38:57 +0100
Subject: [PATCH] fix: DroppingCandy event

---
 .../Scp330/DroppingScp330EventArgs.cs          |  4 ++--
 .../Patches/Events/Scp330/DroppingCandy.cs     | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/EXILED/Exiled.Events/EventArgs/Scp330/DroppingScp330EventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp330/DroppingScp330EventArgs.cs
index 1542d6aa0e..0ead45776d 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp330/DroppingScp330EventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp330/DroppingScp330EventArgs.cs
@@ -39,9 +39,9 @@ public DroppingScp330EventArgs(Player player, Scp330Bag scp330, CandyKindID cand
         }
 
         /// <summary>
-        /// Gets or sets a value representing the <see cref="API.Features.Items.Item" /> being picked up.
+        /// Gets a value representing the <see cref="API.Features.Items.Item" /> being picked up.
         /// </summary>
-        public Scp330 Scp330 { get; set; } // Todo Remove set
+        public Scp330 Scp330 { get; }
 
         /// <inheritdoc/>
         public Item Item => Scp330;
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp330/DroppingCandy.cs b/EXILED/Exiled.Events/Patches/Events/Scp330/DroppingCandy.cs
index 21f4d40ed9..36ea89bccd 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp330/DroppingCandy.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp330/DroppingCandy.cs
@@ -56,15 +56,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
                     // scp330Bag
                     new(OpCodes.Ldloc_1),
-
-                    // Load candy bag array to get CandyKindID
                     new(OpCodes.Dup),
-                    new(OpCodes.Ldfld, Field(typeof(Scp330Bag), nameof(Scp330Bag.Candies))),
-                    new(OpCodes.Ldarg_1),
 
-                    // Grab candy ID from network message, and pass it to event args.
+                    // msg.CandyID
+                    new(OpCodes.Ldarg_1),
                     new(OpCodes.Ldfld, Field(typeof(SelectScp330Message), nameof(SelectScp330Message.CandyID))),
-                    new(OpCodes.Ldelem_U1),
+
+                    // CandyKindID
+                    new(OpCodes.Call, Method(typeof(DroppingCandy), nameof(DroppingCandy.GetCandyID))),
 
                     // DroppingScp330EventArgs ev = new(Player, Scp330Bag, CandyKindID)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(DroppingScp330EventArgs))[0]),
@@ -105,5 +104,12 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
+
+        private static CandyKindID GetCandyID(Scp330Bag scp330Bag, int index)
+        {
+            if (index < 0 || index > scp330Bag.Candies.Count)
+                return CandyKindID.None;
+            return scp330Bag.Candies[index];
+        }
     }
 }
\ No newline at end of file