Skip to content

fix: fix Marshmallow::MakeEvil not using ahp processes correctly and fix formatting in custom roles Get command #701

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
louis1706 merged 1 commit into from
Dec 22, 2025
Merged

fix: fix Marshmallow::MakeEvil not using ahp processes correctly and fix formatting in custom roles Get command #701

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
2 changes: 1 addition & 1 deletion EXILED/Exiled.API/Features/Items/Marshmallow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void MakeEvil(AhpStat.AhpProcess evilProcess = null)
if (Evil)
return;

Base.ReleaseEvil(evilProcess ?? EvilAhpProcess ?? new AhpStat.AhpProcess(450F, 450F, 0F, 1F, 0F, true));
Base.ReleaseEvil(evilProcess ?? EvilAhpProcess ?? Owner.GetModule<AhpStat>().ServerAddProcess(450F, 450F, 0F, 1F, 0F, true));
}
}
}
15 changes: 11 additions & 4 deletions EXILED/Exiled.CustomRoles/Commands/Get.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace Exiled.CustomRoles.Commands
using System.Text;

using CommandSystem;
using Exiled.API.Extensions;
using Exiled.API.Features;
using Exiled.API.Features.Pools;
using Exiled.CustomRoles.API;
Expand Down Expand Up @@ -90,22 +91,28 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
StringBuilder builder = StringBuilderPool.Pool.Get();

builder.AppendLine();
builder.AppendLine("================= Custom Roles =================");
builder.AppendLine("====================== Custom Roles ======================");

foreach (Player target in players)
{
ReadOnlyCollection<CustomRole> roles = target.GetCustomRoles();
builder.Append((target.DisplayNickname + (target.HasCustomName ? $" ({target.Nickname})" : string.Empty)).PadRight(30 + (target.HasCustomName ? 23 : 0)));
builder.Append(" ");
builder.Append($"({target.Id})".PadRight(5));
if (roles.IsEmpty())
{
builder.AppendLine($"{target.DisplayNickname.PadRight(30)} | None");
builder.AppendLine(" | No Custom Role");
}
else
{
builder.AppendLine($"{target.DisplayNickname.PadRight(30)} ({target.Id}) | [{string.Join(", ", roles.Select(role => role.ToString()))}]");
// builder.Append($" | [{string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>"))}]");
builder.Append(" | [");
builder.Append(string.Join(", ", roles.Select(role => $"<color={role.Role.GetColor().ToHex()}>{role}</color>")));
builder.AppendLine("]");
}
}

builder.AppendLine("================================================");
builder.AppendLine("==========================================================");

ListPool<Player>.Pool.Return(players);

Expand Down
Loading