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

Replace most T.Parse with T.TryParse for all user input.

Browse Source
This commit is contained in:
hondacrx
2017-11-05 15:21:29 -05:00
parent 8c863de8a6
commit 8ed446ae7a
40 changed files with 477 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/DisableManager.cs
+14 -7
View File
@@ -86,18 +86,25 @@ namespace Game
continue;
}
if (flags.HasAnyFlag<byte>(DisableFlags.SpellMap))
if (flags.HasAnyFlag(DisableFlags.SpellMap))
{
var array = new StringArray(params_0, ',');
for (byte i = 0; i < array.Length;)
data.param0.Add(uint.Parse(array[i++]));
{
if (uint.TryParse(array[i++], out uint id))
data.param0.Add(id);
}
}
if (flags.HasAnyFlag<byte>(DisableFlags.SpellArea))
if (flags.HasAnyFlag(DisableFlags.SpellArea))
{
var array = new StringArray(params_1, ',');
for (byte i = 0; i < array.Length;)
data.param1.Add(uint.Parse(array[i++]));
{
if (uint.TryParse(array[i++], out uint id))
data.param1.Add(id);
}
}
break;
@@ -121,11 +128,11 @@ namespace Game
break;
case MapTypes.Instance:
case MapTypes.Raid:
if (flags.HasAnyFlag<byte>(DisableFlags.DungeonStatusHeroic) && Global.DB2Mgr.GetMapDifficultyData(entry, Difficulty.Heroic) == null)
if (flags.HasAnyFlag(DisableFlags.DungeonStatusHeroic) && Global.DB2Mgr.GetMapDifficultyData(entry, Difficulty.Heroic) == null)
flags -= DisableFlags.DungeonStatusHeroic;
if (flags.HasAnyFlag<byte>(DisableFlags.DungeonStatusHeroic10Man) && Global.DB2Mgr.GetMapDifficultyData(entry, Difficulty.Raid10HC) == null)
if (flags.HasAnyFlag(DisableFlags.DungeonStatusHeroic10Man) && Global.DB2Mgr.GetMapDifficultyData(entry, Difficulty.Raid10HC) == null)
flags -= DisableFlags.DungeonStatusHeroic10Man;
if (flags.HasAnyFlag<byte>(DisableFlags.DungeonStatusHeroic25Man) && Global.DB2Mgr.GetMapDifficultyData(entry, Difficulty.Raid25HC) == null)
if (flags.HasAnyFlag(DisableFlags.DungeonStatusHeroic25Man) && Global.DB2Mgr.GetMapDifficultyData(entry, Difficulty.Raid25HC) == null)
flags -= DisableFlags.DungeonStatusHeroic25Man;
if (flags == 0)
isFlagInvalid = true;