diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellDefines.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index c5a44aefc51..a7736b13a0e 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -457,6 +457,9 @@ bool Map::AddPlayerToMap(Player* player, bool initPlayer /*= true*/) player->UpdateObjectVisibility(false); PhasingHandler::SendToPlayer(player); + if (Instanceable()) + player->RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2::EnteringInstance); + if (player->IsAlive()) ConvertCorpseToBones(player->GetGUID()); diff --git a/src/server/game/Spells/SpellDefines.h b/src/server/game/Spells/SpellDefines.h index dd4d6445dff..6c7cb09869c 100644 --- a/src/server/game/Spells/SpellDefines.h +++ b/src/server/game/Spells/SpellDefines.h @@ -127,7 +127,7 @@ enum class SpellAuraInterruptFlags2 : uint32 StartOfEncounter = 0x00000100, // NYI EndOfEncounter = 0x00000200, // NYI Disconnect = 0x00000400, // NYI - EnteringInstance = 0x00000800, // NYI + EnteringInstance = 0x00000800, // Implemented in Map::AddPlayerToMap DuelEnd = 0x00001000, // NYI LeaveArenaOrBattleground = 0x00002000, // Implemented in Battleground::RemovePlayerAtLeave ChangeTalent = 0x00004000, |