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

Core/Instances: Fixed instance greet messages and getting booted from old raids by not being in a raid group

Browse Source
This commit is contained in:
hondacrx
2018-07-19 10:15:45 -04:00
parent f012fbffe8
commit 95b71dc5e5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Map.cs
+1 -1
View File
@@ -539,7 +539,7 @@ namespace Game.Entities
return true; return true;
// raid instances require the player to be in a raid group to be valid // 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()) if (!GetGroup() || !GetGroup().isRaidGroup())
return false; return false;
Source/Game/Handlers/MovementHandler.cs
+1 -1
View File
@@ -350,7 +350,7 @@ namespace Game
if (mInstance != null) if (mInstance != null)
{ {
// check if this instance has a reset time and send it to player if so // 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); MapDifficultyRecord mapDiff = Global.DB2Mgr.GetMapDifficultyData(mapEntry.Id, diff);
if (mapDiff != null) if (mapDiff != null)
{ {