diff --git a/EXILED/Exiled.API/Features/Items/Marshmallow.cs b/EXILED/Exiled.API/Features/Items/Marshmallow.cs index 05b8579cf..349fe342f 100644 --- a/EXILED/Exiled.API/Features/Items/Marshmallow.cs +++ b/EXILED/Exiled.API/Features/Items/Marshmallow.cs @@ -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().ServerAddProcess(450F, 450F, 0F, 1F, 0F, true)); } } } \ No newline at end of file diff --git a/EXILED/Exiled.CustomRoles/Commands/Get.cs b/EXILED/Exiled.CustomRoles/Commands/Get.cs index 2bc08b629..a37ec11ce 100644 --- a/EXILED/Exiled.CustomRoles/Commands/Get.cs +++ b/EXILED/Exiled.CustomRoles/Commands/Get.cs @@ -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; @@ -90,22 +91,28 @@ public bool Execute(ArraySegment 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 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 => $"{role}"))}]"); + builder.Append(" | ["); + builder.Append(string.Join(", ", roles.Select(role => $"{role}"))); + builder.AppendLine("]"); } } - builder.AppendLine("================================================"); + builder.AppendLine("=========================================================="); ListPool.Pool.Return(players);