Skip to content

fix: some fixes for 14.1 #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BoltonDev merged 5 commits into from
Apr 28, 2025
Merged

fix: some fixes for 14.1 #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e46db6
fix: command type invalid
BoltonDev Apr 28, 2025
ca4e4c8
fix: landing event
BoltonDev Apr 28, 2025
07d8557
fix: EscapingPocketDimension event
BoltonDev Apr 28, 2025
5a599ff
fix: Handcuffing / RemovingHandcuff events
BoltonDev Apr 28, 2025
a15d85a
fix: sentvalidcommand event
BoltonDev Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions EXILED/Exiled.Events/EventArgs/Player/EscapingPocketDimensionEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ public class EscapingPocketDimensionEventArgs : IPlayerEvent, IDeniableEvent
/// <param name="pocketDimensionTeleport">
/// <inheritdoc cref="Teleporter" />
/// </param>
/// <param name="player">
/// <param name="hub">
/// <inheritdoc cref="Player" />
/// </param>
/// <param name="position">
/// <inheritdoc cref="TeleportPosition" />
/// </param>
public EscapingPocketDimensionEventArgs(PocketDimensionTeleport pocketDimensionTeleport, Player player, Vector3 position)
public EscapingPocketDimensionEventArgs(PocketDimensionTeleport pocketDimensionTeleport, ReferenceHub hub, Vector3 position)
{
Teleporter = pocketDimensionTeleport;
Player = player;
Player = Player.Get(hub);
TeleportPosition = position;
}

Expand Down
4 changes: 2 additions & 2 deletions EXILED/Exiled.Events/Patches/Events/Player/EscapingPocketDimension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
new[]
{
// pocketDimensionTeleport
new CodeInstruction(OpCodes.Ldarg_0),
new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),

// referenceHub
new CodeInstruction(OpCodes.Ldarg_1).MoveLabelsFrom(newInstructions[index]),
new CodeInstruction(OpCodes.Ldarg_1),

// Scp106PocketExitFinder.GetBestExitPosition(fpcRole)
new(OpCodes.Ldloc_0),
Expand Down
2 changes: 1 addition & 1 deletion EXILED/Exiled.Events/Patches/Events/Player/Landing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
{
// Player.Get(base.OwnerHub)
new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
new(OpCodes.Call, PropertyGetter(typeof(CharacterModel), nameof(CharacterModel.OwnerHub))),
new(OpCodes.Callvirt, PropertyGetter(typeof(CharacterModel), nameof(CharacterModel.OwnerHub))),
new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),

// LandingEventArgs ev = new(Player)
Expand Down
4 changes: 2 additions & 2 deletions EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
Label returnLabel = generator.DefineLabel();

int offset = -3;
int offset = -6;
int index = newInstructions.FindIndex(
instruction => instruction.opcode == OpCodes.Newobj && (ConstructorInfo)instruction.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.PlayerEvents.PlayerCuffingEventArgs))[0]) + offset;
instruction => instruction.opcode == OpCodes.Newobj && (ConstructorInfo)instruction.operand == GetDeclaredConstructors(typeof(LabApi.Events.Arguments.PlayerEvents.PlayerUncuffingEventArgs))[0]) + offset;

newInstructions.InsertRange(
index,
Expand Down
25 changes: 10 additions & 15 deletions EXILED/Exiled.Events/Patches/Events/Player/SendingValidGameConsoleCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Exiled.Events.Patches.Events.Player
using Exiled.Events.EventArgs.Player;

using HarmonyLib;

using LabApi.Features.Enums;
using RemoteAdmin;

using static HarmonyLib.AccessTools;
Expand Down Expand Up @@ -67,8 +67,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
// command
new (OpCodes.Ldloc_S, 4),

// commandtype client
new(OpCodes.Ldc_I4_2),
// CommandType.Client
new(OpCodes.Ldc_I4_S, (sbyte)CommandType.Client),

// query
new(OpCodes.Ldarg_1),
Expand Down Expand Up @@ -130,25 +130,20 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
});

offset = 1;
index = newInstructions.FindIndex(instrction => instrction.Calls(Method(typeof(GameConsoleTransmission), nameof(GameConsoleTransmission.SendToClient)))) + offset;
index = newInstructions.FindLastIndex(i => i.Calls(Method(typeof(GameConsoleTransmission), nameof(GameConsoleTransmission.SendToClient)))) + offset;
newInstructions.InsertRange(
index,
new CodeInstruction[]
{
// this
new(OpCodes.Ldarg_0),

// this._hub
new(OpCodes.Ldfld, Field(typeof(QueryProcessor), nameof(QueryProcessor._hub))),

// Player.Get(Hub)
new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new Type[] { typeof(ReferenceHub) })),
// Player.Get(sender)
new(OpCodes.Ldloc_0),
new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(CommandSender) })),

// command
new(OpCodes.Ldloc_1),
new(OpCodes.Ldloc_S, 4),

// commandtype CLIENT
new(OpCodes.Ldc_I4_2),
// CommandType.Client
new (OpCodes.Ldc_I4_S, (sbyte)CommandType.Client),

// query
new(OpCodes.Ldarg_1),
Expand Down
18 changes: 9 additions & 9 deletions EXILED/Exiled.Events/Patches/Events/Player/SendingValidRACommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Exiled.Events.Patches.Events.Player
using Exiled.Events.EventArgs.Player;

using HarmonyLib;

using LabApi.Features.Enums;
using RemoteAdmin;

using static HarmonyLib.AccessTools;
Expand Down Expand Up @@ -66,8 +66,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
// command
new (OpCodes.Ldloc_2),

// commandtype
new (OpCodes.Ldc_I4_4),
// CommandType.RemoteAdmin
new (OpCodes.Ldc_I4_S, (sbyte)CommandType.RemoteAdmin),

// query
new (OpCodes.Ldarg_0),
Expand Down Expand Up @@ -128,22 +128,22 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
});

offset = 1;
index = newInstructions.FindIndex(instrction => instrction.Calls(Method(typeof(CommandSender), nameof(CommandSender.RaReply)))) + offset;
index = newInstructions.FindIndex(i => i.Calls(Method(typeof(CommandSender), nameof(CommandSender.RaReply)))) + offset;
newInstructions.InsertRange(
index,
new CodeInstruction[]
new[]
{
// sender
new (OpCodes.Ldarg_1),
new CodeInstruction(OpCodes.Ldarg_1).MoveLabelsFrom(newInstructions[index]),

// Player.get(sender)
new (OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new Type[] { typeof(CommandSender) })),
new (OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(CommandSender) })),

// command
new (OpCodes.Ldloc_2),

// commandtype
new (OpCodes.Ldc_I4_4),
// CommandType.RemoteAdmin
new (OpCodes.Ldc_I4_S, (sbyte)CommandType.RemoteAdmin),

// query
new (OpCodes.Ldarg_0),
Expand Down
Loading