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

Core/Misc: Fixed some wrong racemask comparisons.

Browse Source
This commit is contained in:
hondacrx
2021-02-09 13:59:10 -05:00
parent 6de13ba3dd
commit 956cbb0738
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/DB2Manager.cs
+1 -1
View File
@@ -1920,7 +1920,7 @@ namespace Game.DataStorage
var bounds = _skillRaceClassInfoBySkill.LookupByKey(skill); var bounds = _skillRaceClassInfoBySkill.LookupByKey(skill);
foreach (var record in bounds) foreach (var record in bounds)
{ {
if (record.RaceMask != 0 && !Convert.ToBoolean(record.RaceMask & (1 << ((byte)race - 1)))) if (record.RaceMask != 0 && !Convert.ToBoolean(record.RaceMask & SharedConst.GetMaskForRace(race)))
continue; continue;
if (record.ClassMask != 0 && !Convert.ToBoolean(record.ClassMask & (1 << ((byte)class_ - 1)))) if (record.ClassMask != 0 && !Convert.ToBoolean(record.ClassMask & (1 << ((byte)class_ - 1))))
continue; continue;
Source/Game/Globals/ObjectManager.cs
+3 -3
View File
@@ -5630,12 +5630,12 @@ namespace Game
if (items.Empty()) if (items.Empty())
continue; continue;
for (uint raceIndex = (int)Race.Human; raceIndex < (int)Race.Max; ++raceIndex) for (var raceIndex = Race.Human; raceIndex < Race.Max; ++raceIndex)
{ {
if (!characterLoadout.RaceMask.HasAnyFlag(raceIndex)) if (!characterLoadout.RaceMask.HasAnyFlag(SharedConst.GetMaskForRace(raceIndex)))
continue; continue;
PlayerInfo playerInfo = _playerInfo[raceIndex][characterLoadout.ChrClassID]; PlayerInfo playerInfo = _playerInfo[(int)raceIndex][characterLoadout.ChrClassID];
if (playerInfo != null) if (playerInfo != null)
{ {
foreach (ItemTemplate itemTemplate in items) foreach (ItemTemplate itemTemplate in items)