Don't disallow players chosing bot names.

This commit is contained in:
Matthias Mailänder
2024-07-26 18:36:58 +02:00
committed by Gustas
parent 4e5556dccc
commit 9761a68cd4

View File

@@ -14,7 +14,6 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA namespace OpenRA
{ {
@@ -446,11 +445,10 @@ namespace OpenRA
public static string SanitizedPlayerName(string dirty) public static string SanitizedPlayerName(string dirty)
{ {
var forbiddenNames = new string[] { "Open", "Closed" }; var forbiddenNames = new string[] { "Open", "Closed" };
var botNames = OpenRA.Game.ModData.DefaultRules.Actors[SystemActors.Player].TraitInfos<IBotInfo>().Select(t => t.Name);
var clean = SanitizedName(dirty); var clean = SanitizedName(dirty);
if (string.IsNullOrWhiteSpace(clean) || forbiddenNames.Contains(clean) || botNames.Contains(clean)) if (string.IsNullOrWhiteSpace(clean) || forbiddenNames.Contains(clean))
clean = new PlayerSettings().Name; clean = new PlayerSettings().Name;
// avoid UI glitches // avoid UI glitches