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

Core/Spells: Allow removing same npc entry multiple times for AuraType.LinkedSummon if it's from different effects of the same spell

Browse Source 
Core/Maps: Allow entering raid maps without a raid group for maps older than current expansion
This commit is contained in:
hondacrx
2018-05-22 11:34:16 -04:00
parent 90751a6a28
commit 43d49f9e9b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/MapManager.cs
+1 -1
View File
@@ -154,7 +154,7 @@ namespace Game.Entities
string mapName = entry.MapName[Global.WorldMgr.GetDefaultDbcLocale()];
Group group = player.GetGroup();
if (entry.IsRaid()) // can only enter in a raid group
if (entry.IsRaid() && entry.Expansion() >= (Expansion)WorldConfig.GetIntValue(WorldCfg.Expansion)) // can only enter in a raid group but raids from old expansion don't need a group
if ((!group || !group.isRaidGroup()) && WorldConfig.GetBoolValue(WorldCfg.InstanceIgnoreRaid))
return EnterState.CannotEnterNotInRaid;
Source/Game/Spells/Auras/AuraEffect.cs
+2 -4
View File
@@ -6049,10 +6049,8 @@ namespace Game.Spells
{
uint summonEntry = (uint)spellEffect.MiscValue;
if (summonEntry != 0)
{
if (!summonedEntries.Contains(summonEntry))
summonedEntries.Add(summonEntry);
}
summonedEntries.Add(summonEntry);
}
}