Skip to content

Temp fix for RestartingRound #258

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
Misaka-ZeroTwo merged 1 commit into from
Nov 29, 2024
Merged

Temp fix for RestartingRound #258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 11 additions & 55 deletions EXILED/Exiled.Events/Patches/Events/Server/RestartingRound.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,78 +12,34 @@ namespace Exiled.Events.Patches.Events.Server
using System.Reflection.Emit;

using API.Features.Pools;
using CustomPlayerEffects.Danger;
using Exiled.API.Enums;
using Exiled.Events.Attributes;
using Exiled.Events.EventArgs.Player;
using GameCore;

using HarmonyLib;

using RoundRestarting;

using static HarmonyLib.AccessTools;
using static PlayerList;

/// <summary>
/// Patches <see cref="RoundRestart.InitiateRoundRestart"/>.
/// Adds the <see cref="Handlers.Server.RestartingRound" /> event.
/// </summary>
[EventPatch(typeof(Handlers.Server), nameof(Handlers.Server.RestartingRound))]
[HarmonyPatch(typeof(RoundRestart), nameof(RoundRestart.InitiateRoundRestart))]
[HarmonyPatch(typeof(RoundRestart), nameof(RoundRestart.IsRoundRestarting), MethodType.Setter)]
internal static class RestartingRound
{
private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
// TODO: Convert to transpiler and bring back old features
private static void Prefix(bool value)
{
List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
if (!value || value == RoundRestart.IsRoundRestarting)
return;

newInstructions.InsertRange(
0,
new CodeInstruction[]
{
// Handlers.Server.OnRestartingRound()
new(OpCodes.Call, Method(typeof(Handlers.Server), nameof(Handlers.Server.OnRestartingRound))),

// API.Features.Log.Debug("Round restarting", Loader.ShouldDebugBeShown)
new(OpCodes.Ldstr, "Round restarting"),
new(OpCodes.Call, Method(typeof(API.Features.Log), nameof(API.Features.Log.Debug), new[] { typeof(string) })),
});

const int offset = 1;
int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Brfalse);

newInstructions.InsertRange(
index + offset,
new CodeInstruction[]
{
// if (ServerStatic.StopNextRound == ServerStatic.NextRoundAction.Restart) -> goto normal round restart
new(OpCodes.Call, PropertyGetter(typeof(ServerStatic), nameof(ServerStatic.StopNextRound))),
new(OpCodes.Ldc_I4_1),
new(OpCodes.Beq_S, newInstructions[index].operand),

// if (ShouldServerRestart()) -> goto normal round restart
new(OpCodes.Call, Method(typeof(RestartingRound), nameof(ShouldServerRestart))),
new(OpCodes.Brtrue, newInstructions[index].operand),
});

for (int z = 0; z < newInstructions.Count; z++)
yield return newInstructions[z];

ListPool<CodeInstruction>.Pool.Return(newInstructions);
}

private static bool ShouldServerRestart()
{
bool flag = false;

try
{
int num = ConfigFile.ServerConfig.GetInt("restart_after_rounds");

flag = num > 0 && RoundRestart.UptimeRounds >= num;
}
catch (Exception ex)
{
ServerConsole.AddLog("Failed to check the restart_after_rounds config value: " + ex.Message, ConsoleColor.Red);
}

return flag;
Handlers.Server.OnRestartingRound();
}
}
}
}