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 1/4] 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))),
                 };

From 608bbcd6d36cb80bc8facba3b5a54986181566d6 Mon Sep 17 00:00:00 2001
From: Yamato <louismonneyron5@yahoo.com>
Date: Thu, 1 Aug 2024 23:54:06 +0200
Subject: [PATCH 2/4] Fix Naming

---
 .../EventArgs/Scp079/RecontainedEventArgs.cs           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
index e3aab7e69..530170ffe 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
@@ -23,14 +23,14 @@ public class RecontainedEventArgs : IScp079Event
         /// <inheritdoc cref="Player" />
         /// </param>
         /// <param name="scp079Recontainer">
-        /// <inheritdoc cref="Scp079Recontainer" />
+        /// <inheritdoc cref="Recontainer" />
         /// </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);
+            Recontainer = scp079Recontainer;
+            Attacker = Player.Get(scp079Recontainer._activatorGlass.LastAttacker);
             IsAutomatic = scp079Recontainer._activatorGlass.LastAttacker.IsSet;
         }
 
@@ -45,12 +45,12 @@ public RecontainedEventArgs(Player player, PlayerRoles.PlayableScps.Scp079.Scp07
         /// <summary>
         /// Gets the instance that handle SCP-079 recontained proccess.
         /// </summary>
-        public PlayerRoles.PlayableScps.Scp079.Scp079Recontainer Scp079Recontainer { get; }
+        public PlayerRoles.PlayableScps.Scp079.Scp079Recontainer Recontainer { get; }
 
         /// <summary>
         /// Gets the player that recontained SCP-079.
         /// </summary>
-        public Player PlayerWhoRecontainedScp079DoNotKeepThisNAmeOKAYYYY { get; }
+        public Player Attacker { get; }
 
         /// <summary>
         /// Gets a value indicating whether or not the recontained has been made automatically or by triggering the proccess.

From f236787697b84dc230bc5e3b4053ca3bc69c8105 Mon Sep 17 00:00:00 2001
From: Misaka-ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com>
Date: Tue, 6 Aug 2024 21:25:15 +0800
Subject: [PATCH 3/4] grammar

---
 EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
index 530170ffe..73cc6854f 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
@@ -48,7 +48,7 @@ public RecontainedEventArgs(Player player, PlayerRoles.PlayableScps.Scp079.Scp07
         public PlayerRoles.PlayableScps.Scp079.Scp079Recontainer Recontainer { get; }
 
         /// <summary>
-        /// Gets the player that recontained SCP-079.
+        /// Gets the player who recontained SCP-079.
         /// </summary>
         public Player Attacker { get; }
 

From d15031980f628dc39c756261493c974fd8153676 Mon Sep 17 00:00:00 2001
From: Misaka-ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com>
Date: Tue, 6 Aug 2024 21:26:42 +0800
Subject: [PATCH 4/4] Update RecontainedEventArgs.cs

---
 EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
index 73cc6854f..49b5dbebd 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs
@@ -53,8 +53,8 @@ public RecontainedEventArgs(Player player, PlayerRoles.PlayableScps.Scp079.Scp07
         public Player Attacker { get; }
 
         /// <summary>
-        /// Gets a value indicating whether or not the recontained has been made automatically or by triggering the proccess.
+        /// Gets a value indicating whether the recontainment has been made automatically or by triggering the process.
         /// </summary>
         public bool IsAutomatic { get; }
     }
-}
\ No newline at end of file
+}