From 8785c0d5a5bf1967ee1469fdaf0d024dd22f0f0d Mon Sep 17 00:00:00 2001 From: Gildor Date: Tue, 18 Feb 2025 12:36:04 +0100 Subject: Core/Groups: align the player's dungeon/raid difficulty with the group's difficulty upon joining, regardless of the player's level. (#30699) --- src/server/game/Groups/Group.cpp | 19 ++++++++----------- src/server/game/Maps/Map.h | 5 ----- 2 files changed, 8 insertions(+), 16 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 7c17d794c0e..dd49abd092a 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -467,18 +467,15 @@ bool Group::AddMember(Player* player) player->ResetInstances(INSTANCE_RESET_GROUP_JOIN, false); player->ResetInstances(INSTANCE_RESET_GROUP_JOIN, true); - if (player->GetLevel() >= LEVELREQUIREMENT_HEROIC) + if (player->GetDungeonDifficulty() != GetDungeonDifficulty()) { - if (player->GetDungeonDifficulty() != GetDungeonDifficulty()) - { - player->SetDungeonDifficulty(GetDungeonDifficulty()); - player->SendDungeonDifficulty(true); - } - if (player->GetRaidDifficulty() != GetRaidDifficulty()) - { - player->SetRaidDifficulty(GetRaidDifficulty()); - player->SendRaidDifficulty(true); - } + player->SetDungeonDifficulty(GetDungeonDifficulty()); + player->SendDungeonDifficulty(true); + } + if (player->GetRaidDifficulty() != GetRaidDifficulty()) + { + player->SetRaidDifficulty(GetRaidDifficulty()); + player->SendRaidDifficulty(true); } } player->SetGroupUpdateFlag(GROUP_UPDATE_FULL); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 1f8ff20264f..f82420e49e3 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -216,11 +216,6 @@ public: #pragma pack(push, 1) -enum LevelRequirementVsMode -{ - LEVELREQUIREMENT_HEROIC = 70 -}; - struct ZoneDynamicInfo { ZoneDynamicInfo(); -- cgit v1.2.3