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

Core/Misc: Changed GetLocaleByName to return invalid value on invalid input instead of LOCALE_enUS

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/79cd94d26df33a332586b2aa72a99b123199c88f)
This commit is contained in:
hondacrx
2020-07-14 17:11:56 -04:00
parent e179d29b55
commit 4bb9823456
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/BNetServer/Networking/Services/Authentication.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace BNetServer.Networking
return BattlenetRpcErrorCode.BadPlatform; return BattlenetRpcErrorCode.BadPlatform;
} }
if (logonRequest.Locale.ToEnum<Locale>() == Locale.enUS && logonRequest.Locale != "enUS") if (!SharedConst.IsValidLocale(logonRequest.Locale.ToEnum<Locale>()))
{ {
Log.outDebug(LogFilter.Session, $"Battlenet.LogonRequest: {GetClientInfo()} attempted to log in with unsupported locale (using {logonRequest.Locale})!"); Log.outDebug(LogFilter.Session, $"Battlenet.LogonRequest: {GetClientInfo()} attempted to log in with unsupported locale (using {logonRequest.Locale})!");
return BattlenetRpcErrorCode.BadLocale; return BattlenetRpcErrorCode.BadLocale;
Source/Framework/Constants/SharedConst.cs
+5
View File
@@ -370,6 +370,11 @@ namespace Framework.Constants
} }
return SkillType.None; return SkillType.None;
} }
public static bool IsValidLocale(Locale locale)
{
return locale < Locale.Total && locale != Locale.None;
}
} }
public enum Locale public enum Locale
Source/Game/Achievements/AchievementManager.cs
+1 -1
View File
@@ -1328,7 +1328,7 @@ namespace Game.Achievements
AchievementRewardLocale data = new AchievementRewardLocale(); AchievementRewardLocale data = new AchievementRewardLocale();
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
ObjectManager.AddLocaleString(result.Read<string>(2), locale, data.Subject); ObjectManager.AddLocaleString(result.Read<string>(2), locale, data.Subject);
Source/Game/Globals/ObjectManager.cs
+13 -13
View File
@@ -3060,7 +3060,7 @@ namespace Game
string localeName = trainerLocalesResult.Read<string>(1); string localeName = trainerLocalesResult.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
Trainer trainer = _trainers.LookupByKey(trainerId); Trainer trainer = _trainers.LookupByKey(trainerId);
@@ -7884,7 +7884,7 @@ namespace Game
uint id = result.Read<uint>(0); uint id = result.Read<uint>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_creatureLocaleStorage.ContainsKey(id)) if (!_creatureLocaleStorage.ContainsKey(id))
@@ -7916,7 +7916,7 @@ namespace Game
uint id = result.Read<uint>(0); uint id = result.Read<uint>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_gameObjectLocaleStorage.ContainsKey(id)) if (!_gameObjectLocaleStorage.ContainsKey(id))
@@ -7947,7 +7947,7 @@ namespace Game
uint id = result.Read<uint>(0); uint id = result.Read<uint>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_questTemplateLocaleStorage.ContainsKey(id)) if (!_questTemplateLocaleStorage.ContainsKey(id))
@@ -7982,7 +7982,7 @@ namespace Game
uint id = result.Read<uint>(0); uint id = result.Read<uint>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_questObjectivesLocaleStorage.ContainsKey(id)) if (!_questObjectivesLocaleStorage.ContainsKey(id))
@@ -8035,7 +8035,7 @@ namespace Game
string localeName = result.Read<string>(2); string localeName = result.Read<string>(2);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_questGreetingLocaleStorage[type].ContainsKey(id)) if (!_questGreetingLocaleStorage[type].ContainsKey(id))
@@ -8064,7 +8064,7 @@ namespace Game
uint id = result.Read<uint>(0); uint id = result.Read<uint>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_questOfferRewardLocaleStorage.ContainsKey(id)) if (!_questOfferRewardLocaleStorage.ContainsKey(id))
@@ -8091,7 +8091,7 @@ namespace Game
uint id = result.Read<uint>(0); uint id = result.Read<uint>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_questRequestItemsLocaleStorage.ContainsKey(id)) if (!_questRequestItemsLocaleStorage.ContainsKey(id))
@@ -8121,7 +8121,7 @@ namespace Game
string localeName = result.Read<string>(2); string localeName = result.Read<string>(2);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
GossipMenuItemsLocale data = new GossipMenuItemsLocale(); GossipMenuItemsLocale data = new GossipMenuItemsLocale();
@@ -8150,7 +8150,7 @@ namespace Game
uint id = result.Read<uint>(0); uint id = result.Read<uint>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_pageTextLocaleStorage.ContainsKey(id)) if (!_pageTextLocaleStorage.ContainsKey(id))
@@ -8178,7 +8178,7 @@ namespace Game
uint id = result.Read<uint>(0); uint id = result.Read<uint>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (!_pointOfInterestLocaleStorage.ContainsKey(id)) if (!_pointOfInterestLocaleStorage.ContainsKey(id))
@@ -9172,7 +9172,7 @@ namespace Game
int choiceId = result.Read<int>(0); int choiceId = result.Read<int>(0);
string localeName = result.Read<string>(1); string localeName = result.Read<string>(1);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
if (GetPlayerChoice(choiceId) == null) if (GetPlayerChoice(choiceId) == null)
@@ -9204,7 +9204,7 @@ namespace Game
int responseId = result.Read<int>(1); int responseId = result.Read<int>(1);
string localeName = result.Read<string>(2); string localeName = result.Read<string>(2);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
var playerChoiceLocale = _playerChoiceLocales.LookupByKey(choiceId); var playerChoiceLocale = _playerChoiceLocales.LookupByKey(choiceId);
Source/Game/Text/CreatureTextManager.cs
+1 -1
View File
@@ -143,7 +143,7 @@ namespace Game
uint id = result.Read<byte>(2); uint id = result.Read<byte>(2);
string localeName = result.Read<string>(3); string localeName = result.Read<string>(3);
Locale locale = localeName.ToEnum<Locale>(); Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS) if (!SharedConst.IsValidLocale(locale) || locale == Locale.enUS)
continue; continue;
var key = new CreatureTextId(creatureId, groupId, id); var key = new CreatureTextId(creatureId, groupId, id);