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

Core/Misc: Update a few enums from db2 to 9.0.2

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d4ad9870105ca149cf6f41563ea26d5faf246fa9)
This commit is contained in:
hondacrx
2021-02-02 10:06:49 -05:00
parent 1325a2d5ab
commit f18a9c1ec9
7 changed files with 419 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattleGrounds/BattleGroundManager.cs
+6 -6
View File
@@ -647,9 +647,9 @@ namespace Game.BattleGrounds
case BattlegroundTypeId.AV:
return HolidayIds.CallToArmsAv;
case BattlegroundTypeId.EY:
return HolidayIds.CallToArmsEy;
return HolidayIds.CallToArmsEs;
case BattlegroundTypeId.WS:
return HolidayIds.CallToArmsWs;
return HolidayIds.CallToArmsWg;
case BattlegroundTypeId.SA:
return HolidayIds.CallToArmsSa;
case BattlegroundTypeId.AB:
@@ -659,7 +659,7 @@ namespace Game.BattleGrounds
case BattlegroundTypeId.TP:
return HolidayIds.CallToArmsTp;
case BattlegroundTypeId.BFG:
return HolidayIds.CallToArmsBfg;
return HolidayIds.CallToArmsBg;
default:
return HolidayIds.None;
}
@@ -671,9 +671,9 @@ namespace Game.BattleGrounds
{
case HolidayIds.CallToArmsAv:
return BattlegroundTypeId.AV;
case HolidayIds.CallToArmsEy:
case HolidayIds.CallToArmsEs:
return BattlegroundTypeId.EY;
case HolidayIds.CallToArmsWs:
case HolidayIds.CallToArmsWg:
return BattlegroundTypeId.WS;
case HolidayIds.CallToArmsSa:
return BattlegroundTypeId.SA;
@@ -683,7 +683,7 @@ namespace Game.BattleGrounds
return BattlegroundTypeId.IC;
case HolidayIds.CallToArmsTp:
return BattlegroundTypeId.TP;
case HolidayIds.CallToArmsBfg:
case HolidayIds.CallToArmsBg:
return BattlegroundTypeId.BFG;
default:
return BattlegroundTypeId.None;
Source/Game/DungeonFinding/LFGManager.cs
+4 -4
View File
@@ -1902,17 +1902,17 @@ namespace Game.DungeonFinding
case 285: // The Headless Horseman
return Global.GameEventMgr.IsHolidayActive(HolidayIds.HallowsEnd);
case 286: // The Frost Lord Ahune
return Global.GameEventMgr.IsHolidayActive(HolidayIds.FireFestival);
return Global.GameEventMgr.IsHolidayActive(HolidayIds.MidsummerFireFestival);
case 287: // Coren Direbrew
return Global.GameEventMgr.IsHolidayActive(HolidayIds.Brewfest);
case 288: // The Crown Chemical Co.
return Global.GameEventMgr.IsHolidayActive(HolidayIds.LoveIsInTheAir);
case 744: // Random Timewalking Dungeon (Burning Crusade)
return Global.GameEventMgr.IsHolidayActive(HolidayIds.TimewalkingOutlands);
return Global.GameEventMgr.IsHolidayActive(HolidayIds.TimewalkingDungeonEventBcDefault);
case 995: // Random Timewalking Dungeon (Wrath of the Lich King)
return Global.GameEventMgr.IsHolidayActive(HolidayIds.TimewalkingNorthrend);
return Global.GameEventMgr.IsHolidayActive(HolidayIds.TimewalkingDungeonEventLkDefault);
case 1146: // Random Timewalking Dungeon (Cataclysm)
return Global.GameEventMgr.IsHolidayActive(HolidayIds.TimewalkingCataclysm);
return Global.GameEventMgr.IsHolidayActive(HolidayIds.TimewalkingDungeonEventCataDefault);
}
return false;
}
Source/Game/Globals/ObjectManager.cs
+1 -2
View File
@@ -2639,8 +2639,7 @@ namespace Game
cInfo.CreatureType = CreatureType.Humanoid;
}
// must exist or used hidden but used in data horse case
if (cInfo.Family != 0 && !CliDB.CreatureFamilyStorage.ContainsKey(cInfo.Family) && cInfo.Family != CreatureFamily.HorseCustom)
if (cInfo.Family != 0 && !CliDB.CreatureFamilyStorage.ContainsKey(cInfo.Family))
{
Log.outError(LogFilter.Sql, "Creature (Entry: {0}) has invalid creature family ({1}) in `family`.", cInfo.Entry, cInfo.Family);
cInfo.Family = CreatureFamily.None;