Core/Instances: Fixed instance greet messages and getting booted from old raids by not being in a raid group
This commit is contained in:
@@ -539,7 +539,7 @@ namespace Game.Entities
|
||||
return true;
|
||||
|
||||
// raid instances require the player to be in a raid group to be valid
|
||||
if (map.IsRaid() && !WorldConfig.GetBoolValue(WorldCfg.InstanceIgnoreRaid))
|
||||
if (map.IsRaid() && !WorldConfig.GetBoolValue(WorldCfg.InstanceIgnoreRaid) && (map.GetEntry().Expansion() >= (Expansion)WorldConfig.GetIntValue(WorldCfg.Expansion)))
|
||||
if (!GetGroup() || !GetGroup().isRaidGroup())
|
||||
return false;
|
||||
|
||||
|
||||
@@ -350,7 +350,7 @@ namespace Game
|
||||
if (mInstance != null)
|
||||
{
|
||||
// check if this instance has a reset time and send it to player if so
|
||||
Difficulty diff = GetPlayer().GetDifficultyID(mapEntry);
|
||||
Difficulty diff = newMap.GetDifficultyID();
|
||||
MapDifficultyRecord mapDiff = Global.DB2Mgr.GetMapDifficultyData(mapEntry.Id, diff);
|
||||
if (mapDiff != null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user