From 43d49f9e9b477f36a6092ce766f6f6e664c4a33d Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 22 May 2018 11:34:16 -0400 Subject: [PATCH] Core/Spells: Allow removing same npc entry multiple times for AuraType.LinkedSummon if it's from different effects of the same spell Core/Maps: Allow entering raid maps without a raid group for maps older than current expansion --- Source/Game/Maps/MapManager.cs | 2 +- Source/Game/Spells/Auras/AuraEffect.cs | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Game/Maps/MapManager.cs b/Source/Game/Maps/MapManager.cs index 03618afcc..6d9ffc1b3 100644 --- a/Source/Game/Maps/MapManager.cs +++ b/Source/Game/Maps/MapManager.cs @@ -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; diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs index fb526489f..b4d87fddf 100644 --- a/Source/Game/Spells/Auras/AuraEffect.cs +++ b/Source/Game/Spells/Auras/AuraEffect.cs @@ -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); + } }