From a743eaf21e5be46f43a313242bff3df9edc0f197 Mon Sep 17 00:00:00 2001 From: VALERA771 Date: Tue, 26 Nov 2024 22:54:30 +0300 Subject: [PATCH 1/2] finals --- EXILED/Exiled.API/Enums/DoorType.cs | 3 +-- EXILED/Exiled.API/Features/Player.cs | 3 +-- .../Exiled.CustomItems/API/Features/CustomItem.cs | 2 +- .../EventArgs/Map/PlacingBulletHoleEventArgs.cs | 4 ++-- .../EventArgs/Player/EscapedEventArgs.cs | 15 +-------------- .../EventArgs/Player/ShootingEventArgs.cs | 4 +++- .../Patches/Events/Item/ChangingAmmo.cs | 4 +++- .../Patches/Events/Item/ReceivingPreference.cs | 3 ++- .../Patches/Events/Map/PlacingBulletHole.cs | 4 +++- .../Patches/Events/Map/SpawningTeamVehicle.cs | 12 +++++++++--- .../Events/Player/EnteringKillerCollision.cs | 3 +-- .../Patches/Events/Player/Hurting.cs | 2 +- .../Patches/Events/Player/Shooting.cs | 4 +++- .../Patches/Events/Player/SpawningRagdoll.cs | 3 ++- .../Patches/Events/Scp106/Stalking.cs | 4 +--- .../Patches/Events/Server/SelectingRespawnTeam.cs | 2 +- .../Exiled.Events/Patches/Fixes/ArmorDropPatch.cs | 2 +- .../Patches/Fixes/FixPickupPreviousOwner.cs | 2 +- .../Patches/Fixes/NWFixDetonationTimer.cs | 2 +- .../Patches/Fixes/NWFixScp096BreakingDoor.cs | 2 +- EXILED/Exiled.Example/Events/PlayerHandler.cs | 3 ++- 21 files changed, 41 insertions(+), 42 deletions(-) diff --git a/EXILED/Exiled.API/Enums/DoorType.cs b/EXILED/Exiled.API/Enums/DoorType.cs index 04f38c19d4..745557a6a7 100644 --- a/EXILED/Exiled.API/Enums/DoorType.cs +++ b/EXILED/Exiled.API/Enums/DoorType.cs @@ -8,8 +8,7 @@ namespace Exiled.API.Enums { using Exiled.API.Features.Doors; - - using static Interactables.Interobjects.ElevatorManager; + using Interactables.Interobjects; /// /// Unique identifier for the different types of doors. diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs index 6a67717b18..ddad6ca4ce 100644 --- a/EXILED/Exiled.API/Features/Player.cs +++ b/EXILED/Exiled.API/Features/Player.cs @@ -45,7 +45,6 @@ namespace Exiled.API.Features using MEC; using Mirror; using Mirror.LiteNetLib4Mirror; - using NorthwoodLib; using PlayerRoles; using PlayerRoles.FirstPersonControl; using PlayerRoles.RoleAssign; @@ -1323,7 +1322,7 @@ public static Player Get(string args) if (!player.IsVerified || player.Nickname is null) continue; - if (!player.Nickname.Contains(args, StringComparison.OrdinalIgnoreCase)) + if (!player.Nickname.ToLower().Contains(args.ToLower())) continue; string secondString = player.Nickname; diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs index dcfd61f285..a01621fbb2 100644 --- a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs +++ b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs @@ -692,7 +692,7 @@ public virtual uint Spawn(IEnumerable spawnPoints, uint limit) if (pickup.Is(out Exiled.API.Features.Pickups.FirearmPickup firearmPickup) && this is CustomWeapon customWeapon) { - firearmPickup + // set MaxAmmo if synced TODO } } diff --git a/EXILED/Exiled.Events/EventArgs/Map/PlacingBulletHoleEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/PlacingBulletHoleEventArgs.cs index a662f3af29..8a066fbaf9 100644 --- a/EXILED/Exiled.Events/EventArgs/Map/PlacingBulletHoleEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Map/PlacingBulletHoleEventArgs.cs @@ -27,9 +27,9 @@ public class PlacingBulletHoleEventArgs : IFirearmEvent, IPlayerEvent, IDeniable /// /// /// - public PlacingBulletHoleEventArgs(Firearm firearm, RaycastHit hit) + public PlacingBulletHoleEventArgs(Item firearm, RaycastHit hit) { - Firearm = firearm; + Firearm = firearm.As(); Player = Firearm.Owner; Position = hit.point; Rotation = Quaternion.LookRotation(hit.normal); diff --git a/EXILED/Exiled.Events/EventArgs/Player/EscapedEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/EscapedEventArgs.cs index 9f74663cdc..6b470210ca 100644 --- a/EXILED/Exiled.Events/EventArgs/Player/EscapedEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Player/EscapedEventArgs.cs @@ -28,13 +28,10 @@ public class EscapedEventArgs : IPlayerEvent /// /// /// - /// , . - public EscapedEventArgs(Player player, EscapeScenario escapeScenario, Role role, KeyValuePair kvp) + public EscapedEventArgs(Player player, EscapeScenario escapeScenario, Role role) { Player = player; EscapeScenario = escapeScenario; - Team = kvp.Key; - Tickets = kvp.Value; OldRole = role; EscapeTime = (int)Math.Ceiling(role.ActiveTime.TotalSeconds); } @@ -47,16 +44,6 @@ public EscapedEventArgs(Player player, EscapeScenario escapeScenario, Role role, /// public EscapeScenario EscapeScenario { get; } - /// - /// Gets the that gained tickets for this escape. - /// - public SpawnableTeamType Team { get; } - - /// - /// Gets the amount of tickets gained for this escape. - /// - public float Tickets { get; } - /// /// Gets the previous role for this player. /// diff --git a/EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs index 6a61a64b96..442953da3a 100644 --- a/EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs @@ -42,7 +42,7 @@ public ShootingEventArgs(Player shooter, BaseFirearm firearm) { Player = shooter; Firearm = Item.Get(firearm).As(); - ShotMessage = msg; + //ShotMessage = msg; } /// @@ -58,6 +58,7 @@ public ShootingEventArgs(Player shooter, BaseFirearm firearm) /// public Item Item => Firearm; + /* /// /// Gets or sets the for the event. /// @@ -104,6 +105,7 @@ public uint TargetNetId }; } } + */ /// /// Gets or sets a value indicating whether the shot can be fired. diff --git a/EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs b/EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs index 2d020b250e..72298393cb 100644 --- a/EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs +++ b/EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs @@ -27,9 +27,10 @@ namespace Exiled.Events.Patches.Events.Item /// Adds the event. /// [EventPatch(typeof(Item), nameof(Item.ChangingAmmo))] - [HarmonyPatch(typeof(Firearm), nameof(Firearm.Status), MethodType.Setter)] + //[HarmonyPatch(typeof(Firearm), nameof(Firearm.Status), MethodType.Setter)] internal static class ChangingAmmo { + /* private static IEnumerable Transpiler(IEnumerable instructions, ILGenerator generator) { List newInstructions = ListPool.Pool.Get(instructions); @@ -137,5 +138,6 @@ private static IEnumerable Transpiler(IEnumerable.Pool.Return(newInstructions); } + */ } } \ No newline at end of file diff --git a/EXILED/Exiled.Events/Patches/Events/Item/ReceivingPreference.cs b/EXILED/Exiled.Events/Patches/Events/Item/ReceivingPreference.cs index 1558c49fe9..96b9907b3a 100644 --- a/EXILED/Exiled.Events/Patches/Events/Item/ReceivingPreference.cs +++ b/EXILED/Exiled.Events/Patches/Events/Item/ReceivingPreference.cs @@ -39,7 +39,8 @@ private static IEnumerable Transpiler(IEnumerable newInstructions = ListPool.Pool.Get(instructions); - int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Ldloc_1); + int offset = 1; + int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset; LocalBuilder ev = generator.DeclareLocal(typeof(ReceivingPreferenceEventArgs)); LocalBuilder curCode = generator.DeclareLocal(typeof(uint)); diff --git a/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs b/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs index d3b603620d..52ea6fa067 100644 --- a/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs +++ b/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs @@ -5,6 +5,8 @@ // // ----------------------------------------------------------------------- +using InventorySystem.Items; + namespace Exiled.Events.Patches.Events.Map { using System.Collections.Generic; @@ -47,7 +49,7 @@ private static IEnumerable Transpiler(IEnumerable Transpiler(IEnumerable x.opcode == OpCodes.Newobj) + offset; + + newInstructions.InsertRange(index, new[] { + new(OpCodes.Stloc_S, msg.LocalIndex), + // if (type != RespawnEffectsController.EffectType.Selection) // goto continueLabel; - new(OpCodes.Ldarg_0), + new(OpCodes.Ldloc_S, msg.LocalIndex), new(OpCodes.Callvirt, PropertyGetter(typeof(WaveUpdateMessage), nameof(WaveUpdateMessage.IsTrigger))), new(OpCodes.Brfalse_S, continueLabel), @@ -72,7 +78,7 @@ private static IEnumerable Transpiler(IEnumerable Transpiler(IEnumerable instruction.opcode == OpCodes.Newobj) + offset; + int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Ldloc_0); newInstructions.InsertRange( index, diff --git a/EXILED/Exiled.Events/Patches/Events/Player/Hurting.cs b/EXILED/Exiled.Events/Patches/Events/Player/Hurting.cs index 24ed4358e4..11e3e2a96c 100644 --- a/EXILED/Exiled.Events/Patches/Events/Player/Hurting.cs +++ b/EXILED/Exiled.Events/Patches/Events/Player/Hurting.cs @@ -82,7 +82,7 @@ private static IEnumerable Transpiler(IEnumerable events. /// [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.Shooting))] - [HarmonyPatch(typeof(FirearmBasicMessagesHandler), nameof(FirearmBasicMessagesHandler.ServerShotReceived))] + // [HarmonyPatch(typeof(FirearmBasicMessagesHandler), nameof(FirearmBasicMessagesHandler.ServerShotReceived))] internal static class Shooting { + /* private static IEnumerable Transpiler(IEnumerable instructions, ILGenerator generator) { List newInstructions = ListPool.Pool.Get(instructions); @@ -85,5 +86,6 @@ private static IEnumerable Transpiler(IEnumerable.Pool.Return(newInstructions); } + */ } } \ No newline at end of file diff --git a/EXILED/Exiled.Events/Patches/Events/Player/SpawningRagdoll.cs b/EXILED/Exiled.Events/Patches/Events/Player/SpawningRagdoll.cs index 8732772db9..2f9651160f 100644 --- a/EXILED/Exiled.Events/Patches/Events/Player/SpawningRagdoll.cs +++ b/EXILED/Exiled.Events/Patches/Events/Player/SpawningRagdoll.cs @@ -72,7 +72,8 @@ private static IEnumerable Transpiler(IEnumerable Transpiler(IEnumerable instruction.operand == (object)PropertySetter(typeof(Scp106StalkAbility), nameof(Scp106StalkAbility.StalkActive))) + offset; newInstructions.InsertRange( - index, + newInstructions.Count - 1, new CodeInstruction[] { // Player.Get(this.Owner); diff --git a/EXILED/Exiled.Events/Patches/Events/Server/SelectingRespawnTeam.cs b/EXILED/Exiled.Events/Patches/Events/Server/SelectingRespawnTeam.cs index 8e95b2c564..8c509c2597 100644 --- a/EXILED/Exiled.Events/Patches/Events/Server/SelectingRespawnTeam.cs +++ b/EXILED/Exiled.Events/Patches/Events/Server/SelectingRespawnTeam.cs @@ -27,7 +27,7 @@ namespace Exiled.Events.Patches.Events.Server /// Patches to add the event. /// [EventPatch(typeof(Handlers.Server), nameof(Handlers.Server.SelectingRespawnTeam))] - [HarmonyPatch(typeof(RespawnManager), nameof(RespawnManager.Update))] + // [HarmonyPatch(typeof(WaveManager), nameof(RespawnManager.Update))] TODO Idk which method to patch internal static class SelectingRespawnTeam { private static IEnumerable Transpiler(IEnumerable instructions, ILGenerator generator) diff --git a/EXILED/Exiled.Events/Patches/Fixes/ArmorDropPatch.cs b/EXILED/Exiled.Events/Patches/Fixes/ArmorDropPatch.cs index be35fc38e7..0ed2949c65 100644 --- a/EXILED/Exiled.Events/Patches/Fixes/ArmorDropPatch.cs +++ b/EXILED/Exiled.Events/Patches/Fixes/ArmorDropPatch.cs @@ -21,7 +21,7 @@ namespace Exiled.Events.Patches.Fixes /// /// Patches to fix https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/230 bug. /// - [HarmonyPatch(typeof(BodyArmorUtils), nameof(BodyArmorUtils.RemoveEverythingExceedingLimits))] + [HarmonyPatch(typeof(BodyArmorUtils), nameof(BodyArmorUtils.RemoveEverythingExceedingLimits), typeof(Inventory), typeof(BodyArmor), typeof(bool), typeof(bool))] internal static class ArmorDropPatch { private static IEnumerable Transpiler(IEnumerable instructions, ILGenerator generator) diff --git a/EXILED/Exiled.Events/Patches/Fixes/FixPickupPreviousOwner.cs b/EXILED/Exiled.Events/Patches/Fixes/FixPickupPreviousOwner.cs index d555c8f51f..24d743e6e0 100644 --- a/EXILED/Exiled.Events/Patches/Fixes/FixPickupPreviousOwner.cs +++ b/EXILED/Exiled.Events/Patches/Fixes/FixPickupPreviousOwner.cs @@ -37,7 +37,7 @@ private static IEnumerable Transpiler(IEnumerable Math.Abs(d.TimeToDetonate - ConfigFile.ServerConfig.GetInt("warhead_tminus_start_duration", 90))).First()); + networkInfo.ScenarioId = (byte)Array.IndexOf(AlphaWarheadController.Singleton._startScenarios, AlphaWarheadController.Singleton._startScenarios.OrderBy(d => Math.Abs(d.TimeToDetonate - ConfigFile.ServerConfig.GetInt("warhead_tminus_start_duration", 90))).First()); AlphaWarheadController.Singleton.NetworkInfo = networkInfo; return; diff --git a/EXILED/Exiled.Events/Patches/Fixes/NWFixScp096BreakingDoor.cs b/EXILED/Exiled.Events/Patches/Fixes/NWFixScp096BreakingDoor.cs index 8360e824c6..a3e42f1172 100644 --- a/EXILED/Exiled.Events/Patches/Fixes/NWFixScp096BreakingDoor.cs +++ b/EXILED/Exiled.Events/Patches/Fixes/NWFixScp096BreakingDoor.cs @@ -34,7 +34,7 @@ private static IEnumerable Transpiler(IEnumerable newInstructions = ListPool.Pool.Get(instructions); Label ret = generator.DefineLabel(); - int offset = -4; + int offset = -5; int index = newInstructions.FindIndex(x => x.operand == (object)Method(typeof(IDamageableDoor), nameof(IDamageableDoor.ServerDamage))) + offset; newInstructions.InsertRange(index, new[] diff --git a/EXILED/Exiled.Example/Events/PlayerHandler.cs b/EXILED/Exiled.Example/Events/PlayerHandler.cs index 235868706e..9f37aecb1e 100644 --- a/EXILED/Exiled.Example/Events/PlayerHandler.cs +++ b/EXILED/Exiled.Example/Events/PlayerHandler.cs @@ -157,7 +157,8 @@ public void OnUsingItem(UsingItemEventArgs ev) /// public void OnShooting(ShootingEventArgs ev) { - Log.Info($"{ev.Player.Nickname} is shooting a {ev.Player.CurrentItem.Type}! Target Pos: {ev.ShotPosition} Target object ID: {ev.TargetNetId} Allowed: {ev.IsAllowed}"); + // Log.Info($"{ev.Player.Nickname} is shooting a {ev.Player.CurrentItem.Type}! Target Pos: {ev.ShotPosition} Target object ID: {ev.TargetNetId} Allowed: {ev.IsAllowed}"); + // TODO we need to fix this cuz... we need to fix it } /// From bdfd69093e87deb30facef2350cf5e695f681cb4 Mon Sep 17 00:00:00 2001 From: VALERA771 Date: Tue, 26 Nov 2024 22:58:47 +0300 Subject: [PATCH 2/2] fix --- .../EventArgs/Map/SpawningTeamVehicleEventArgs.cs | 3 +-- EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs | 6 ++---- .../EventArgs/Server/RespawningTeamEventArgs.cs | 5 +---- EXILED/Exiled.Events/Handlers/Server.cs | 6 +++--- EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs | 5 +++-- .../Patches/Events/Map/ExplodingFragGrenade.cs | 2 +- .../Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs | 3 +-- .../Exiled.Events/Patches/Events/Map/SpawningTeamVehicle.cs | 2 -- EXILED/Exiled.Events/Patches/Events/Player/DamagingDoor.cs | 2 +- .../Patches/Events/Player/EscapingAndEscaped.cs | 1 - .../Patches/Events/Player/InteractingElevator.cs | 2 +- EXILED/Exiled.Events/Patches/Events/Player/Joined.cs | 2 +- EXILED/Exiled.Events/Patches/Events/Player/Shooting.cs | 3 ++- EXILED/Exiled.Events/Patches/Events/Player/Shot.cs | 2 -- EXILED/Exiled.Events/Patches/Events/Player/Spawning.cs | 2 +- .../Exiled.Events/Patches/Events/Scp914/UpgradingPlayer.cs | 2 +- .../Patches/Events/Server/SelectingRespawnTeam.cs | 3 ++- .../Patches/Fixes/FixOnAddedBeingCallAfterOnRemoved.cs | 2 +- .../Exiled.Events/Patches/Fixes/NWFixScp096BreakingDoor.cs | 3 +-- EXILED/Exiled.Events/Patches/Generic/PickupControlPatch.cs | 2 +- 20 files changed, 24 insertions(+), 34 deletions(-) diff --git a/EXILED/Exiled.Events/EventArgs/Map/SpawningTeamVehicleEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/SpawningTeamVehicleEventArgs.cs index d1b633b7b0..2e455ff305 100644 --- a/EXILED/Exiled.Events/EventArgs/Map/SpawningTeamVehicleEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Map/SpawningTeamVehicleEventArgs.cs @@ -5,12 +5,11 @@ // // ----------------------------------------------------------------------- -using Respawning.Waves; - namespace Exiled.Events.EventArgs.Map { using Exiled.Events.EventArgs.Interfaces; using Respawning; + using Respawning.Waves; /// /// Contains all information before the server spawns a team's respawn vehicle. diff --git a/EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs index 442953da3a..c348e649b1 100644 --- a/EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Player/ShootingEventArgs.cs @@ -35,14 +35,12 @@ public class ShootingEventArgs : IPlayerEvent, IDeniableEvent, IFirearmEvent /// /// /// - /// - /// - /// public ShootingEventArgs(Player shooter, BaseFirearm firearm) { Player = shooter; Firearm = Item.Get(firearm).As(); - //ShotMessage = msg; + + // ShotMessage = msg; } /// diff --git a/EXILED/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs index eee756d7b0..f475591a6f 100644 --- a/EXILED/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs @@ -5,18 +5,15 @@ // // ----------------------------------------------------------------------- -using Respawning.Waves; - namespace Exiled.Events.EventArgs.Server { using System.Collections.Generic; using Exiled.API.Features; using Exiled.Events.EventArgs.Interfaces; - using PlayerRoles; - using Respawning; + using Respawning.Waves; /// /// Contains all information before spawning a wave of or diff --git a/EXILED/Exiled.Events/Handlers/Server.cs b/EXILED/Exiled.Events/Handlers/Server.cs index 399a5fcfe0..a48d599a2d 100644 --- a/EXILED/Exiled.Events/Handlers/Server.cs +++ b/EXILED/Exiled.Events/Handlers/Server.cs @@ -5,13 +5,13 @@ // // ----------------------------------------------------------------------- -using Respawning.Waves; - namespace Exiled.Events.Handlers { using System.Collections.Generic; using Respawning; + using Respawning.Waves; + #pragma warning disable SA1623 // Property summary documentation should match accessors using Exiled.Events.EventArgs.Player; @@ -165,7 +165,7 @@ public static class Server /// /// Called after team spawns. /// - /// + /// /// public static void OnRespawnedTeam(SpawnableWaveBase teamType, List hubs) => RespawnedTeam.InvokeSafely(new RespawnedTeamEventArgs(teamType, hubs)); diff --git a/EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs b/EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs index 72298393cb..7ef8824daf 100644 --- a/EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs +++ b/EXILED/Exiled.Events/Patches/Events/Item/ChangingAmmo.cs @@ -23,11 +23,12 @@ namespace Exiled.Events.Patches.Events.Item using static HarmonyLib.AccessTools; /// - /// Patches . + /// Patches . /// Adds the event. /// [EventPatch(typeof(Item), nameof(Item.ChangingAmmo))] - //[HarmonyPatch(typeof(Firearm), nameof(Firearm.Status), MethodType.Setter)] + + // [HarmonyPatch(typeof(Firearm), nameof(Firearm.Status), MethodType.Setter)] internal static class ChangingAmmo { /* diff --git a/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFragGrenade.cs b/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFragGrenade.cs index 60faf8a974..37a8bef64c 100644 --- a/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFragGrenade.cs +++ b/EXILED/Exiled.Events/Patches/Events/Map/ExplodingFragGrenade.cs @@ -26,7 +26,7 @@ namespace Exiled.Events.Patches.Events.Map using static HarmonyLib.AccessTools; /// - /// Patches . + /// Patches . /// Adds the event. /// [EventPatch(typeof(Handlers.Map), nameof(Handlers.Map.ExplodingGrenade))] diff --git a/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs b/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs index 52ea6fa067..180fb3e816 100644 --- a/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs +++ b/EXILED/Exiled.Events/Patches/Events/Map/PlacingBulletHole.cs @@ -5,8 +5,6 @@ // // ----------------------------------------------------------------------- -using InventorySystem.Items; - namespace Exiled.Events.Patches.Events.Map { using System.Collections.Generic; @@ -18,6 +16,7 @@ namespace Exiled.Events.Patches.Events.Map using Exiled.Events.EventArgs.Map; using Handlers; using HarmonyLib; + using InventorySystem.Items; using InventorySystem.Items.Firearms.Modules; using UnityEngine; diff --git a/EXILED/Exiled.Events/Patches/Events/Map/SpawningTeamVehicle.cs b/EXILED/Exiled.Events/Patches/Events/Map/SpawningTeamVehicle.cs index 9681644a38..7ab0ccda71 100644 --- a/EXILED/Exiled.Events/Patches/Events/Map/SpawningTeamVehicle.cs +++ b/EXILED/Exiled.Events/Patches/Events/Map/SpawningTeamVehicle.cs @@ -5,8 +5,6 @@ // // ----------------------------------------------------------------------- -using Respawning.Waves; - namespace Exiled.Events.Patches.Events.Map { using System.Collections.Generic; diff --git a/EXILED/Exiled.Events/Patches/Events/Player/DamagingDoor.cs b/EXILED/Exiled.Events/Patches/Events/Player/DamagingDoor.cs index 2d8d521768..2f5135a56a 100644 --- a/EXILED/Exiled.Events/Patches/Events/Player/DamagingDoor.cs +++ b/EXILED/Exiled.Events/Patches/Events/Player/DamagingDoor.cs @@ -24,7 +24,7 @@ namespace Exiled.Events.Patches.Events.Player using static HarmonyLib.AccessTools; /// - /// Patch the . + /// Patch the . /// Adds the event. /// [EventPatch(typeof(Player), nameof(Player.DamagingDoor))] diff --git a/EXILED/Exiled.Events/Patches/Events/Player/EscapingAndEscaped.cs b/EXILED/Exiled.Events/Patches/Events/Player/EscapingAndEscaped.cs index be16ad1900..dc8d8b40c7 100644 --- a/EXILED/Exiled.Events/Patches/Events/Player/EscapingAndEscaped.cs +++ b/EXILED/Exiled.Events/Patches/Events/Player/EscapingAndEscaped.cs @@ -40,7 +40,6 @@ private static IEnumerable Transpiler(IEnumerable newInstructions = ListPool.Pool.Get(instructions); - List