[Events] Fix null reference (#15)

* fix situation when `ply == null` * lol why --------- Co-authored-by: IRacle <zornik2006@yandex.ru>
ExMod-Team · Aug 6, 2024 · eb046ac · eb046ac
1 parent f1cc6f4
commit eb046ac
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/EXILED/Exiled.Events/EventArgs/Player/ChangingItemEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ChangingItemEventArgs.cs
@@ -46,7 +46,7 @@ public Item Item
             get => newItem;
             set
             {
-                if (!Player.Inventory.UserInventory.Items.TryGetValue(value.Serial, out _))
+                if (value != null && !Player.Inventory.UserInventory.Items.TryGetValue(value.Serial, out _))
                     throw new InvalidOperationException("ev.NewItem cannot be set to an item they do not have.");
 
                 newItem = value;

diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Healing.cs b/EXILED/Exiled.Events/Patches/Events/Player/Healing.cs
@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 // <copyright file="Healing.cs" company="Exiled Team">
 // Copyright (c) Exiled Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
@@ -34,6 +34,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             Label continueLabel = generator.DefineLabel();
+            Label skipHealing = generator.DefineLabel();
+            Label skipHealed = generator.DefineLabel();
 
             LocalBuilder ev = generator.DeclareLocal(typeof(HealingEventArgs));
             LocalBuilder player = generator.DeclareLocal(typeof(Player));
@@ -48,10 +50,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Stloc_S, lastHealth.LocalIndex),
 
                 // player = Player.Get(this.Hub);
+                // if (player == null)
+                //     skip;
                 new(OpCodes.Ldarg_0),
                 new(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(HealthStat), nameof(HealthStat.Hub))),
                 new(OpCodes.Call, AccessTools.Method(typeof(Player), nameof(Player.Get), new Type[] { typeof(ReferenceHub) })),
+                new(OpCodes.Dup),
                 new(OpCodes.Stloc_S, player.LocalIndex),
+                new(OpCodes.Brfalse_S, skipHealing),
 
                 // HealingEventArgs ev = new(Player, amount)
                 new(OpCodes.Ldloc_S, player.LocalIndex),
@@ -76,10 +82,19 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new CodeInstruction(OpCodes.Ldloc_S, ev.LocalIndex).WithLabels(continueLabel),
                 new(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(HealingEventArgs), nameof(HealingEventArgs.Amount))),
                 new(OpCodes.Starg_S, 1),
+
+                new CodeInstruction(OpCodes.Nop).WithLabels(skipHealing),
             });
 
+            newInstructions[newInstructions.Count - 1].labels.Add(skipHealed);
+
             newInstructions.InsertRange(newInstructions.Count - 1, new[]
             {
+                // if (player == null)
+                //     skip;
+                new(OpCodes.Ldloc_S, player.LocalIndex),
+                new(OpCodes.Brfalse_S, skipHealed),
+
                 // HealedEventArgs ev = new(Player, lastAmount)
                 new(OpCodes.Ldloc_S, player.LocalIndex),
                 new(OpCodes.Ldloc_S, lastHealth.LocalIndex),