warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Fixes mobile titles not displaying properly (#1149)

Browse source
This commit is contained in:
mark1145 2022-08-28 06:31:22 +10:00 • committed by GitHub
parent 42f2c7f6ae
commit b8146f26f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 55 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/Server/Buffers/PooledArraySpanFormattable.cs
View file

@ -18,6 +18,12 @@ using System;
namespace Server.Buffers;
/// <summary>
/// Wrapper for STArray backed strings and char buffers that will be used in InterpolatedStringHandlers.
/// The wrapper prevents intermediate strings from being created unnecessarily.
/// Note: TryFormat can only be called once. Using the PooledArraySpanFormattable after calling TryFormat will throw.
/// To use the span multiple times, use the Chars property directly instead.
/// </summary>
public struct PooledArraySpanFormattable : ISpanFormattable, IDisposable
{
private char[] _arrayToReturnToPool;
@ -42,6 +48,7 @@ public struct PooledArraySpanFormattable : ISpanFormattable, IDisposable
STArrayPool<char>.Shared.Return(_arrayToReturnToPool);
_arrayToReturnToPool = null;
// We don't dispose so we can call ToString() multiple times with idempotence.
return _value;
}
@ -58,6 +65,9 @@ public struct PooledArraySpanFormattable : ISpanFormattable, IDisposable
_arrayToReturnToPool.AsSpan(0, _pos).CopyTo(destination);
charsWritten = _pos;
// Interpolated string handlers do not dispose, but we need to return the chars to the array.
Dispose();
return true;
}

40
Projects/Server/Mobiles/Mobile.cs
View file

@ -3228,8 +3228,6 @@ namespace Server
public virtual void AddNameProperties(IPropertyList list)
{
var name = Name ?? " ";
string prefix;
if (ShowFameTitle && (m_Player || m_Body.IsHuman) && m_Fame >= 10000)
@ -3241,22 +3239,19 @@ namespace Server
prefix = " ";
}
var title = PropertyTitle && !string.IsNullOrEmpty(Title) ? Title : "";
string suffix;
var guild = m_Guild;
if (guild != null && (m_Player || m_DisplayGuildTitle))
{
suffix = title.Length > 0
? $"{title} [{Utility.FixHtml(guild.Abbreviation)}]"
: $"[{Utility.FixHtml(guild.Abbreviation)}]";
}
else
{
suffix = " ";
}
var hasTitle = PropertyTitle && !string.IsNullOrEmpty(Title);
var hasGuild = guild != null && (m_Player || m_DisplayGuildTitle);
list.Add(1050045, $"{prefix}\t{name}\t{ApplyNameSuffix(suffix)}"); // ~1_PREFIX~~2_NAME~~3_SUFFIX~
string suffix = hasTitle switch
{
true when hasGuild => $" {Title} [{Utility.FixHtmlFormattable(guild.Abbreviation)}]",
true => $" {Title}",
false when hasGuild => $" [{Utility.FixHtmlFormattable(guild.Abbreviation)}]",
_ => " "
};
list.Add(1050045, $"{prefix}\t{Name ?? " "}\t{ApplyNameSuffix(suffix)}"); // ~1_PREFIX~~2_NAME~~3_SUFFIX~
if (guild != null && (m_DisplayGuildTitle || m_Player && guild.Type != GuildType.Regular))
{
@ -3268,11 +3263,11 @@ namespace Server
{
if (NewGuildDisplay)
{
list.Add($"{Utility.FixHtml(guildTitle)}, {Utility.FixHtml(guild.Name)}");
list.Add($"{Utility.FixHtmlFormattable(guildTitle)}, {Utility.FixHtmlFormattable(guild.Name)}");
}
else
{
list.Add($"{Utility.FixHtml(guildTitle)}, {Utility.FixHtml(guild.Name)} Guild{type}");
list.Add($"{Utility.FixHtmlFormattable(guildTitle)}, {Utility.FixHtmlFormattable(guild.Name)} Guild{type}");
}
}
else
@ -7850,14 +7845,7 @@ namespace Server
prefix = m_Female ? "Lady" : "Lord";
}
var suffix = "";
if (ClickTitle && !string.IsNullOrEmpty(Title))
{
suffix = Title;
}
suffix = ApplyNameSuffix(suffix);
var suffix = ApplyNameSuffix(ClickTitle && !string.IsNullOrEmpty(Title) ? Title : "");
string val;

8
Projects/Server/Text/StringHelpers.cs
View file

@ -303,4 +303,12 @@ public static class StringHelpers
chars = chars[(indexOf + 1)..];
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static char[] ToPooledArray(this string str)
{
var chars = STArrayPool<char>.Shared.Rent(str.Length);
str.CopyTo(chars);
return chars;
}
}

23
Projects/Server/Utilities/Utility.cs
View file

@ -567,12 +567,11 @@ public static class Utility
return str;
}
using var sb = new ValueStringBuilder(str, stackalloc char[Math.Min(128, str.Length)]);
ReadOnlySpan<char> invalid = stackalloc []{ '<', '>', '#' };
ReadOnlySpan<char> replacement = stackalloc []{ '(', ')', '-' };
sb.ReplaceAny(invalid, replacement, 0, sb.Length);
var chars = str.ToPooledArray();
var span = chars.AsSpan(0, str.Length);
FixHtml(span);
return sb.ToString();
return span.ToString();
}
public static void FixHtml(Span<char> chars)
@ -588,6 +587,20 @@ public static class Utility
chars.ReplaceAny(invalid, replacement);
}
public static PooledArraySpanFormattable FixHtmlFormattable(string str)
{
var chars = str.ToPooledArray();
var span = chars.AsSpan(0, str.Length);
var formattable = new PooledArraySpanFormattable(chars, str.Length);
if (!string.IsNullOrEmpty(str))
{
FixHtml(span);
}
return formattable;
}
public static int InsensitiveCompare(string first, string second) => first.InsensitiveCompare(second);
public static bool InsensitiveStartsWith(string first, string second) => first.InsensitiveStartsWith(second);