Skip to content
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.

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

fix: Fix Custom Roles Lagging Back When Spawning #428

Merged
merged 1 commit into from
Feb 5, 2025
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ protected virtual void SubscribeEvents()
Log.Debug($"{Name}: Loading events.");
Exiled.Events.Handlers.Player.ChangingNickname += OnInternalChangingNickname;
Exiled.Events.Handlers.Player.ChangingRole += OnInternalChangingRole;
Exiled.Events.Handlers.Player.Spawning += OnInternalSpawning;
Exiled.Events.Handlers.Player.Spawned += OnInternalSpawned;
Exiled.Events.Handlers.Player.SpawningRagdoll += OnSpawningRagdoll;
Exiled.Events.Handlers.Player.Destroying += OnDestroying;
}
Expand All @@ -877,7 +877,7 @@ protected virtual void UnsubscribeEvents()
Log.Debug($"{Name}: Unloading events.");
Exiled.Events.Handlers.Player.ChangingNickname -= OnInternalChangingNickname;
Exiled.Events.Handlers.Player.ChangingRole -= OnInternalChangingRole;
Exiled.Events.Handlers.Player.Spawning -= OnInternalSpawning;
Exiled.Events.Handlers.Player.Spawned -= OnInternalSpawned;
Exiled.Events.Handlers.Player.SpawningRagdoll -= OnSpawningRagdoll;
Exiled.Events.Handlers.Player.Destroying -= OnDestroying;
}
Expand Down Expand Up @@ -918,9 +918,9 @@ private void OnInternalChangingNickname(ChangingNicknameEventArgs ev)
ev.Player.CustomInfo = $"{ev.NewName}\n{CustomInfo}";
}

private void OnInternalSpawning(SpawningEventArgs ev)
private void OnInternalSpawned(SpawnedEventArgs ev)
{
if (!IgnoreSpawnSystem && SpawnChance > 0 && !Check(ev.Player) && ev.NewRole == Role && Loader.Random.NextDouble() * 100 <= SpawnChance)
if (!IgnoreSpawnSystem && SpawnChance > 0 && !Check(ev.Player) && ev.Player.Role.Type == Role && Loader.Random.NextDouble() * 100 <= SpawnChance)
AddRole(ev.Player);
}

Expand Down