Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/DB2: change regex to simple string Compare.

Browse Source
This commit is contained in:
hondacrx
2018-12-24 01:04:55 -05:00
parent 50019b85d5
commit 11d2d56ddf
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/DB2Manager.cs
+11 -11
View File
@@ -38,7 +38,7 @@ namespace Game.DataStorage
} }
for (uint i = 0; i < (int)LocaleConstant.Total + 1; ++i) for (uint i = 0; i < (int)LocaleConstant.Total + 1; ++i)
_nameValidators[i] = new List<Regex>(); _nameValidators[i] = new List<string>();
} }
public void LoadStores() public void LoadStores()
@@ -305,21 +305,21 @@ namespace Game.DataStorage
{ {
Cypher.Assert(namesProfanity.Language < (int)LocaleConstant.Total || namesProfanity.Language == -1); Cypher.Assert(namesProfanity.Language < (int)LocaleConstant.Total || namesProfanity.Language == -1);
if (namesProfanity.Language != -1) if (namesProfanity.Language != -1)
_nameValidators[namesProfanity.Language].Add(new Regex(namesProfanity.Name, RegexOptions.IgnoreCase | RegexOptions.Compiled)); _nameValidators[namesProfanity.Language].Add(namesProfanity.Name);
else else
for (uint i = 0; i < (int)LocaleConstant.Total; ++i) for (uint i = 0; i < (int)LocaleConstant.Total; ++i)
{ {
if (i == (int)LocaleConstant.None) if (i == (int)LocaleConstant.None)
continue; continue;
_nameValidators[i].Add(new Regex(namesProfanity.Name, RegexOptions.IgnoreCase | RegexOptions.Compiled)); _nameValidators[i].Add(namesProfanity.Name);
} }
} }
CliDB.NamesProfanityStorage.Clear(); CliDB.NamesProfanityStorage.Clear();
foreach (var namesReserved in CliDB.NamesReservedStorage.Values) foreach (var namesReserved in CliDB.NamesReservedStorage.Values)
_nameValidators[(int)LocaleConstant.Total].Add(new Regex(namesReserved.Name, RegexOptions.IgnoreCase | RegexOptions.Compiled)); _nameValidators[(int)LocaleConstant.Total].Add(namesReserved.Name);
CliDB.NamesReservedStorage.Clear(); CliDB.NamesReservedStorage.Clear();
@@ -332,7 +332,7 @@ namespace Game.DataStorage
continue; continue;
if (Convert.ToBoolean(namesReserved.LocaleMask & (1 << i))) if (Convert.ToBoolean(namesReserved.LocaleMask & (1 << i)))
_nameValidators[i].Add(new Regex(namesReserved.Name, RegexOptions.IgnoreCase | RegexOptions.Compiled)); _nameValidators[i].Add(namesReserved.Name);
} }
} }
CliDB.NamesReservedLocaleStorage.Clear(); CliDB.NamesReservedLocaleStorage.Clear();
@@ -1315,13 +1315,13 @@ namespace Game.DataStorage
public ResponseCodes ValidateName(string name, LocaleConstant locale) public ResponseCodes ValidateName(string name, LocaleConstant locale)
{ {
foreach (var regex in _nameValidators[(int)locale]) foreach (var testName in _nameValidators[(int)locale])
if (regex.IsMatch(name)) if (testName.Equals(name, StringComparison.OrdinalIgnoreCase))
return ResponseCodes.CharNameProfane; return ResponseCodes.CharNameProfane;
// regexes at TOTAL_LOCALES are loaded from NamesReserved which is not locale specific // regexes at TOTAL_LOCALES are loaded from NamesReserved which is not locale specific
foreach (var regex in _nameValidators[(int)LocaleConstant.Total]) foreach (var testName in _nameValidators[(int)LocaleConstant.Total])
if (regex.IsMatch(name)) if (testName.Equals(name, StringComparison.OrdinalIgnoreCase))
return ResponseCodes.CharNameReserved; return ResponseCodes.CharNameReserved;
return ResponseCodes.CharNameSuccess; return ResponseCodes.CharNameSuccess;
@@ -1331,7 +1331,7 @@ namespace Game.DataStorage
{ {
NumTalentsAtLevelRecord numTalentsAtLevel = CliDB.NumTalentsAtLevelStorage.LookupByKey(level); NumTalentsAtLevelRecord numTalentsAtLevel = CliDB.NumTalentsAtLevelStorage.LookupByKey(level);
if (numTalentsAtLevel == null) if (numTalentsAtLevel == null)
numTalentsAtLevel = CliDB.NumTalentsAtLevelStorage.LastOrDefault().Value;//.LookupByKey(sNumTalentsAtLevelStore.GetNumRows() - 1); numTalentsAtLevel = CliDB.NumTalentsAtLevelStorage.LastOrDefault().Value;
if (numTalentsAtLevel != null) if (numTalentsAtLevel != null)
{ {
switch (playerClass) switch (playerClass)
@@ -1918,7 +1918,7 @@ namespace Game.DataStorage
MultiMap<uint, MountTypeXCapabilityRecord> _mountCapabilitiesByType = new MultiMap<uint, MountTypeXCapabilityRecord>(); MultiMap<uint, MountTypeXCapabilityRecord> _mountCapabilitiesByType = new MultiMap<uint, MountTypeXCapabilityRecord>();
MultiMap<uint, MountXDisplayRecord> _mountDisplays = new MultiMap<uint, MountXDisplayRecord>(); MultiMap<uint, MountXDisplayRecord> _mountDisplays = new MultiMap<uint, MountXDisplayRecord>();
Dictionary<uint, List<NameGenRecord>[]> _nameGenData = new Dictionary<uint, List<NameGenRecord>[]>(); Dictionary<uint, List<NameGenRecord>[]> _nameGenData = new Dictionary<uint, List<NameGenRecord>[]>();
List<Regex>[] _nameValidators = new List<Regex>[(int)LocaleConstant.Total + 1]; List<string>[] _nameValidators = new List<string>[(int)LocaleConstant.Total + 1];
MultiMap<uint, uint> _phasesByGroup = new MultiMap<uint, uint>(); MultiMap<uint, uint> _phasesByGroup = new MultiMap<uint, uint>();
Dictionary<PowerType, PowerTypeRecord> _powerTypes = new Dictionary<PowerType, PowerTypeRecord>(); Dictionary<PowerType, PowerTypeRecord> _powerTypes = new Dictionary<PowerType, PowerTypeRecord>();
Dictionary<uint, byte> _pvpItemBonus = new Dictionary<uint, byte>(); Dictionary<uint, byte> _pvpItemBonus = new Dictionary<uint, byte>();