Skip to content

fix: Fake Role API + make duplicate commands easier to fix #866

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
Someone-193 merged 1 commit into from
Oct 15, 2026
Merged

fix: Fake Role API + make duplicate commands easier to fix #866

Show file tree
Hide file tree
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
20 changes: 17 additions & 3 deletions EXILED/Exiled.API/Features/Player.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,7 +1941,21 @@ public void TrySetCustomRoleFriendlyFire(string roleTypeId, Dictionary<RoleTypeI
/// This method can be further optimized by only using static RoleData instances in your Funcs.
/// </para>
/// </remarks>
public void SetAppearance(Func<Player, RoleData> generator) => FakeRoleGenerator.Add(generator);
public void SetAppearance(Func<Player, RoleData> generator)
{
FakeRoleGenerator.Add(generator);

foreach (Player viewer in Enumerable)
{
RoleData data = generator(viewer);

if (data.Role == RoleTypeId.None)
continue;

if (viewer != this || data.DataAuthority.HasFlag(RoleData.Authority.AffectSelf))
FakeRoles[viewer] = data;
}
}

/// <summary>
/// Fakes this players role to other viewers.
Expand All @@ -1950,7 +1964,7 @@ public void TrySetCustomRoleFriendlyFire(string roleTypeId, Dictionary<RoleTypeI
/// <param name="fakeRole">The fake role.</param>
/// <param name="authority">How to handle edge cases.</param>
/// <param name="unitId">The Unit ID of the player, if <paramref name="fakeRole"/> is an NTF role.</param>
public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole, RoleData.Authority authority = RoleData.Authority.None, byte unitId = 0)
public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole, RoleData.Authority authority = RoleData.Authority.None, byte? unitId = null)
{
foreach (Player player in viewers)
{
Expand All @@ -1965,7 +1979,7 @@ public void SetAppearance(IEnumerable<Player> viewers, RoleTypeId fakeRole, Role
/// <param name="fakeRole">The fake role.</param>
/// <param name="authority">How to handle edge cases.</param>
/// <param name="unitId">The Unit ID of the player, if <paramref name="fakeRole"/> is an NTF role.</param>
public void SetAppearance(Player player, RoleTypeId fakeRole, RoleData.Authority authority = RoleData.Authority.None, byte unitId = 0)
public void SetAppearance(Player player, RoleTypeId fakeRole, RoleData.Authority authority = RoleData.Authority.None, byte? unitId = null)
=> FakeRoles[player] = new RoleData(fakeRole, authority, unitId);

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion EXILED/Exiled.API/Features/Plugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public virtual void OnRegisteringCommands()
{
if (e.Message.StartsWith("An"))
{
Log.Error($"Command with same name has already registered! Command: {command.Command}");
Log.Error($"Command with same name has already registered! Command: {command.Command}. Type: {command.GetType().FullName}");
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions EXILED/Exiled.API/Structs/RoleData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public struct RoleData : IEquatable<RoleData>
/// <param name="authority">The authority of the role data.</param>
/// <param name="unitId">The fake UnitID, if <paramref name="role"/> is an NTF role.</param>
/// <param name="customData">An action used to write custom data if this role data is used to send a fake role. For 99% of uses, just leave this as null.</param>
public RoleData(RoleTypeId role = RoleTypeId.None, Authority authority = Authority.None, byte unitId = 0, Action<NetworkWriter> customData = null)
public RoleData(RoleTypeId role = RoleTypeId.None, Authority authority = Authority.None, byte? unitId = null, Action<NetworkWriter> customData = null)
{
Role = role;
DataAuthority = authority;
Expand All @@ -37,7 +37,7 @@ public RoleData(RoleTypeId role = RoleTypeId.None, Authority authority = Authori
/// </summary>
/// <remarks>Simply having an authority does not make a direct impact. This enum largely exists to constrict possibly
/// unwanted behavior, so make sure your RoleData actually does what behavior you want.
/// (I. E. <see cref="Authority.AffectSelf"/> will not make a RoleData affect the viewer UNLESS they are the target).</remarks>
/// (I. E. <see cref="Authority.AffectSelf"/> will not make a RoleData affect the viewer UNLESS they are the target of an existing RoleData).</remarks>
[Flags]
public enum Authority
{
Expand Down Expand Up @@ -86,7 +86,7 @@ public enum Authority
/// <summary>
/// Gets or sets the UnitID of the fake role, if <see cref="Role"/> is an NTF role.
/// </summary>
public byte UnitId { get; set; }
public byte? UnitId { get; set; }

/// <summary>
/// Gets or sets the authority of this <see cref="RoleData"/> instance. see <see cref="Authority"/> for details.
Expand Down
2 changes: 0 additions & 2 deletions EXILED/Exiled.Events/Events.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public override void OnEnabled()
Handlers.Server.RoundStarted += Handlers.Internal.Round.OnRoundStarted;
Handlers.Player.ChangingRole += Handlers.Internal.Round.OnChangingRole;
Handlers.Player.Spawned += Handlers.Internal.Round.OnSpawned;
Handlers.Player.Died += Handlers.Internal.Round.OnDied;
Handlers.Player.SpawningRagdoll += Handlers.Internal.Round.OnSpawningRagdoll;
Handlers.Scp049.ActivatingSense += Handlers.Internal.Round.OnActivatingSense;
Handlers.Player.Verified += Handlers.Internal.Round.OnVerified;
Expand Down Expand Up @@ -125,7 +124,6 @@ public override void OnDisabled()
Handlers.Server.RoundStarted -= Handlers.Internal.Round.OnRoundStarted;
Handlers.Player.ChangingRole -= Handlers.Internal.Round.OnChangingRole;
Handlers.Player.Spawned -= Handlers.Internal.Round.OnSpawned;
Handlers.Player.Died -= Handlers.Internal.Round.OnDied;
Handlers.Player.SpawningRagdoll -= Handlers.Internal.Round.OnSpawningRagdoll;
Handlers.Scp049.ActivatingSense -= Handlers.Internal.Round.OnActivatingSense;
Handlers.Player.Verified -= Handlers.Internal.Round.OnVerified;
Expand Down
29 changes: 9 additions & 20 deletions EXILED/Exiled.Events/Handlers/Internal/Round.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,31 +110,22 @@ public static void OnSpawned(SpawnedEventArgs ev)
{
foreach (Player viewer in Player.Enumerable.Where(p => !p.IsNPC && !p.IsHost))
{
foreach (Func<Player, RoleData> generator in ev.Player.FakeRoleGenerator)
if (viewer.FakeRoles.TryGetValue(ev.Player, out RoleData existing) && !existing.DataAuthority.HasFlag(RoleData.Authority.Persist))
viewer.FakeRoles.Remove(ev.Player);

foreach (Func<Player, RoleData> generator in viewer.FakeRoleGenerator)
{
RoleData data = generator(viewer);
RoleData data = generator(ev.Player);

if (data.Role == RoleTypeId.None)
continue;

if (viewer != ev.Player)
{
if (viewer != ev.Player || data.DataAuthority.HasFlag(RoleData.Authority.AffectSelf))
viewer.FakeRoles[ev.Player] = data;
}
}
}
}

/// <inheritdoc cref="Handlers.Player.OnDied(DiedEventArgs)" />
public static void OnDied(DiedEventArgs ev)
{
foreach (Player viewer in Player.Enumerable.Where(p => !p.IsNPC && !p.IsHost))
{
if (viewer.FakeRoles.TryGetValue(ev.Player, out RoleData data) && !data.DataAuthority.HasFlag(RoleData.Authority.Persist))
viewer.FakeRoles.Remove(ev.Player);
}
}

/// <inheritdoc cref="Handlers.Player.OnSpawningRagdoll(SpawningRagdollEventArgs)" />
public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
{
Expand Down Expand Up @@ -179,10 +170,8 @@ public static void OnVerified(VerifiedEventArgs ev)
if (data.Role == RoleTypeId.None)
continue;

if (player != ev.Player)
{
if (player != ev.Player || data.DataAuthority.HasFlag(RoleData.Authority.AffectSelf))
ev.Player.FakeRoles[player] = data;
}
}
}
}
Expand Down Expand Up @@ -237,8 +226,8 @@ public static RoleTypeId OnRoleSyncEvent(ReferenceHub targetHub, ReferenceHub vi

switch (roleBase)
{
case PlayerRoles.HumanRole { UsesUnitNames: true } when data.UnitId != 0:
writer.WriteByte(data.UnitId);
case PlayerRoles.HumanRole { UsesUnitNames: true } when data.UnitId.HasValue:
writer.WriteByte(data.UnitId.Value);
break;

// W stylecop :heart:
Expand Down
Loading