Skip to content

fix: Spawning Rotation Not Sync Bettween Server & Client #823

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

Open
MS-crew wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

fix: Spawning Rotation Not Sync Bettween Server & Client #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
85cd677
idk
MS-crew May 11, 2026
64c4941
shit i forget revert my other try
MS-crew May 11, 2026
a8fb36d
fix risk corutine leak & add vector2 support for spawning & add IsRot…
MS-crew May 24, 2026
cea316e
remove unused usings
MS-crew May 24, 2026
e8d3496
remeove useless opcodes
MS-crew May 24, 2026
c89ff0a
reorder methos
MS-crew May 24, 2026
f061501
Merge branch 'dev' into SpawningRotationFix
MS-crew May 24, 2026
3e4f24b
Update Spawning.cs
MS-crew May 25, 2026
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
27 changes: 17 additions & 10 deletions EXILED/Exiled.Events/EventArgs/Player/SpawningEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

namespace Exiled.Events.EventArgs.Player
{
using System;

using Exiled.API.Features;
using Exiled.API.Features.Roles;
using Exiled.Events.EventArgs.Interfaces;
Expand All @@ -22,6 +20,8 @@ namespace Exiled.Events.EventArgs.Player
/// </summary>
public class SpawningEventArgs : IPlayerEvent
{
private Vector2 spawningRotation;

/// <summary>
/// Initializes a new instance of the <see cref="SpawningEventArgs" /> class.
/// </summary>
Expand All @@ -32,7 +32,7 @@ public class SpawningEventArgs : IPlayerEvent
/// <inheritdoc cref="Position" />
/// </param>
/// <param name="rotation">
/// <inheritdoc cref="HorizontalRotation" />
/// <inheritdoc cref="SpawningRotation" />
/// </param>
/// <param name="newRole">
/// the spawned player's new <see cref="PlayerRoleBase">role</see>.
Expand All @@ -41,7 +41,7 @@ public SpawningEventArgs(Player player, Vector3 position, float rotation, Player
{
Player = player;
Position = position;
HorizontalRotation = rotation;
spawningRotation = new Vector2(0, rotation);
NewRole = Role.Create(newRole);
}

Expand All @@ -64,17 +64,24 @@ public SpawningEventArgs(Player player, Vector3 position, float rotation, Player
/// <remarks>
/// Rotation will apply only for <see cref="FpcRole"/>.
/// </remarks>
public float HorizontalRotation { get; set; }
public Vector2 SpawningRotation
{
get => spawningRotation;
set
{
spawningRotation = value;
IsRotationModified = true;
}
}

/// <summary>
/// Gets the player's old <see cref="PlayerRoleBase">role</see>.
/// Gets the player's new <see cref="PlayerRoleBase">role</see>.
/// </summary>
[Obsolete("Removed because the method is no longer provide OldRole since version 14.0. Use Player.Role instead")]
public Role OldRole => Player.Role;
public Role NewRole { get; }

/// <summary>
/// Gets the player's new <see cref="PlayerRoleBase">role</see>.
/// Gets a value indicating whether the spawning rotation was modified.
/// </summary>
public Role NewRole { get; }
public bool IsRotationModified { get; private set; }
}
}
81 changes: 48 additions & 33 deletions EXILED/Exiled.Events/Patches/Events/Player/Spawning.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ namespace Exiled.Events.Patches.Events.Player

using HarmonyLib;

using MEC;

using PlayerRoles.FirstPersonControl;
using PlayerRoles.FirstPersonControl.Spawnpoints;

using UnityEngine;
Expand All @@ -36,56 +39,68 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
{
List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);

int offset = -1;
LocalBuilder ev = generator.DeclareLocal(typeof(SpawningEventArgs));

// Locate the call to `Transform.position` setter to determine where to insert new instructions.
int offset = -1;
int index = newInstructions.FindIndex(instr => instr.Calls(PropertySetter(typeof(Transform), nameof(Transform.position)))) + offset;

// Declare the `SpawningEventArgs` local variable.
LocalBuilder ev = generator.DeclareLocal(typeof(SpawningEventArgs));

newInstructions.InsertRange(
index,
new[]
newInstructions.InsertRange(index, new CodeInstruction[]
{
// Load `ReferenceHub` (argument 0) and get `Player`.
new CodeInstruction(OpCodes.Ldarg_0), // Load `hub` (first argument passed to the method).
new CodeInstruction(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })), // Call Player.Get(hub) to get the Player instance.
// Player.Get(hub);
new(OpCodes.Ldarg_0),
new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),

// Load `position` (local variable 2).
new CodeInstruction(OpCodes.Ldloc_2),
// spawnLocation
new(OpCodes.Ldloc_2),

// Load `rotation` (local variable 3).
new CodeInstruction(OpCodes.Ldloc_3),
// horizontalRotation
new(OpCodes.Ldloc_3),

// Load `newRole` (argument 1).
new CodeInstruction(OpCodes.Ldarg_1), // Load `newRole` from argument 1.
// newRole
new(OpCodes.Ldarg_1),

// Create a new instance of `SpawningEventArgs`.
new CodeInstruction(OpCodes.Newobj, GetDeclaredConstructors(typeof(SpawningEventArgs))[0]),
// SpawningEventArg ev = new SpawningEventArgs(player, spawnLocation, horizontalRotation, newRole);
new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SpawningEventArgs))[0]),
new(OpCodes.Dup),
new(OpCodes.Stloc, ev.LocalIndex),

// Duplicate the object to store it and pass it around.
new CodeInstruction(OpCodes.Dup), // Duplicate the `SpawningEventArgs` object.
new CodeInstruction(OpCodes.Stloc, ev.LocalIndex), // Store the duplicated object in a local variable.
// Handlers.Player.OnSpawning(ev);
new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnSpawning))),

// Call `Handlers.Player.OnSpawning`.
new CodeInstruction(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnSpawning))),
// spawnLocation = ev.Position;
new(OpCodes.Ldloc, ev.LocalIndex),
new(OpCodes.Call, PropertyGetter(typeof(SpawningEventArgs), nameof(SpawningEventArgs.Position))),
new(OpCodes.Stloc_2),

// Modify `position` from `ev.Position`.
new CodeInstruction(OpCodes.Ldloc, ev.LocalIndex), // Load the `SpawningEventArgs` object stored in the local variable.
new CodeInstruction(OpCodes.Call, PropertyGetter(typeof(SpawningEventArgs), nameof(SpawningEventArgs.Position))), // Get the `Position` property from `SpawningEventArgs`.
new CodeInstruction(OpCodes.Stloc_2), // Store the position value back in the local variable 2 (`position`).

// Modify `rotation` from `ev.HorizontalRotation`.
new CodeInstruction(OpCodes.Ldloc, ev.LocalIndex), // Load the `SpawningEventArgs` object again.
new CodeInstruction(OpCodes.Call, PropertyGetter(typeof(SpawningEventArgs), nameof(SpawningEventArgs.HorizontalRotation))), // Get the `HorizontalRotation` property from `SpawningEventArgs`.
new CodeInstruction(OpCodes.Stloc_3), // Store the rotation value back in the local variable 3 (`rotation`).
// ApplyRotation(fpcRole, ev)
new(OpCodes.Ldloc_0),
new(OpCodes.Ldloc, ev.LocalIndex),
new(OpCodes.Call, Method(typeof(Spawning), nameof(ApplyRotation))),
});

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

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

private static void ApplyRotation(IFpcRole fpcRole, SpawningEventArgs ev)
{
if (!ev.IsRotationModified || fpcRole == null || fpcRole.FpcModule == null)
return;

Timing.RunCoroutine(WaitForMouseLookAndApply(fpcRole.FpcModule, ev.SpawningRotation), fpcRole.FpcModule.gameObject);
}

private static IEnumerator<float> WaitForMouseLookAndApply(FirstPersonMovementModule fpcModule, Vector2 rotation)
{
yield return Timing.WaitUntilFalse(() => fpcModule != null && fpcModule.MouseLook == null);

if (fpcModule == null)
yield break;

yield return Timing.WaitForOneFrame;
fpcModule.ServerOverrideRotation(rotation);
}
}
}
Loading