From c523af3a22f8e88c8cfe4236609663197308a01d Mon Sep 17 00:00:00 2001
From: Yamato <louismonneyron5@yahoo.com>
Date: Thu, 1 Aug 2024 14:11:53 +0200
Subject: [PATCH] RecontainedEventArgs more feature

---
 .../EventArgs/Scp079/RecontainedEventArgs.cs  | 23 ++++++++++++++++++-
 .../Patches/Events/Scp079/Recontain.cs        |  3 ++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
index 84a2e93ad..e3aab7e69 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
@@ -22,10 +22,16 @@ public class RecontainedEventArgs : IScp079Event
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
-        public RecontainedEventArgs(Player player)
+        /// <param name="scp079Recontainer">
+        /// <inheritdoc cref="Scp079Recontainer" />
+        /// </param>
+        public RecontainedEventArgs(Player player, PlayerRoles.PlayableScps.Scp079.Scp079Recontainer scp079Recontainer)
         {
             Player = player;
             Scp079 = player.Role.As<Scp079Role>();
+            Scp079Recontainer = scp079Recontainer;
+            PlayerWhoRecontainedScp079DoNotKeepThisNAmeOKAYYYY = Player.Get(scp079Recontainer._activatorGlass.LastAttacker);
+            IsAutomatic = scp079Recontainer._activatorGlass.LastAttacker.IsSet;
         }
 
         /// <summary>
@@ -35,5 +41,20 @@ public RecontainedEventArgs(Player player)
 
         /// <inheritdoc/>
         public Scp079Role Scp079 { get; }
+
+        /// <summary>
+        /// Gets the instance that handle SCP-079 recontained proccess.
+        /// </summary>
+        public PlayerRoles.PlayableScps.Scp079.Scp079Recontainer Scp079Recontainer { get; }
+
+        /// <summary>
+        /// Gets the player that recontained SCP-079.
+        /// </summary>
+        public Player PlayerWhoRecontainedScp079DoNotKeepThisNAmeOKAYYYY { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the recontained has been made automatically or by triggering the proccess.
+        /// </summary>
+        public bool IsAutomatic { get; }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontain.cs b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontain.cs
index 991ffc47e..3338c84ab 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp079/Recontain.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp079/Recontain.cs
@@ -37,9 +37,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             CodeInstruction[] recontainedEvent = new CodeInstruction[]
                 {
-                    // Handlers.Scp079.OnRecontained(new RecontainedEventArgs(Player.Get(referenceHub2)));
+                    // Handlers.Scp079.OnRecontained(new RecontainedEventArgs(Player.Get(referenceHub2), this));
                     new(OpCodes.Ldloc, 5),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+                    new(OpCodes.Ldarg_0),
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RecontainedEventArgs))[0]),
                     new(OpCodes.Call, Method(typeof(Scp079), nameof(Scp079.OnRecontained))),
                 };