public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core): Fix After PR#21213 Crash (#21327)

Browse Source
This commit is contained in:
天鹿
2025-02-08 00:52:56 +08:00
committed by GitHub
parent 4b8e94924d
commit 9768cfca3a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Entities/Player/PlayerStorage.cpp
View File

@@ -6724,7 +6724,7 @@ bool Player::Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map
if (sDisableMgr->IsDisabledFor(DISABLE_TYPE_MAP, target_map, this)) if (sDisableMgr->IsDisabledFor(DISABLE_TYPE_MAP, target_map, this))
{ {
GetSession()->SendAreaTriggerMessage("{}", GetSession()->GetAcoreString(LANG_INSTANCE_CLOSED)); GetSession()->SendAreaTriggerMessage(LANG_INSTANCE_CLOSED);
return false; return false;
} }
@@ -6862,11 +6862,11 @@ bool Player::Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map
{ {
ObjectMgr::GetLocaleString(il->Name, loc_idx, name); ObjectMgr::GetLocaleString(il->Name, loc_idx, name);
} }
GetSession()->SendAreaTriggerMessage(GetSession()->GetAcoreString(LANG_LEVEL_MINREQUIRED_AND_ITEM), ar->levelMin, name.c_str()); GetSession()->SendAreaTriggerMessage(LANG_LEVEL_MINREQUIRED_AND_ITEM, ar->levelMin, name);
} }
else if (LevelMin) else if (LevelMin)
{ {
GetSession()->SendAreaTriggerMessage(GetSession()->GetAcoreString(LANG_LEVEL_MINREQUIRED), LevelMin); GetSession()->SendAreaTriggerMessage(LANG_LEVEL_MINREQUIRED, LevelMin);
} }
else if (ilvlRequirementNotMet) else if (ilvlRequirementNotMet)
{ {
@@ -6924,11 +6924,11 @@ bool Player::Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map
if (LevelMin) if (LevelMin)
{ {
GetSession()->SendAreaTriggerMessage(GetSession()->GetAcoreString(LANG_LEVEL_MINREQUIRED), LevelMin); GetSession()->SendAreaTriggerMessage(LANG_LEVEL_MINREQUIRED, LevelMin);
} }
else if (LevelMax) else if (LevelMax)
{ {
GetSession()->SendAreaTriggerMessage(GetSession()->GetAcoreString(LANG_ACCESS_REQUIREMENT_MAX_LEVEL), LevelMax); GetSession()->SendAreaTriggerMessage(LANG_ACCESS_REQUIREMENT_MAX_LEVEL, LevelMax);
} }
else if (mapDiff->hasErrorMessage && !errorAlreadyPrinted) else if (mapDiff->hasErrorMessage && !errorAlreadyPrinted)
{ {

2
src/server/game/Maps/MapMgr.cpp
View File

@@ -167,7 +167,7 @@ Map::EnterState MapMgr::PlayerCannotEnter(uint32 mapid, Player* player, bool log
{ {
// probably there must be special opcode, because client has this string constant in GlobalStrings.lua // probably there must be special opcode, because client has this string constant in GlobalStrings.lua
/// @todo: this is not a good place to send the message /// @todo: this is not a good place to send the message
player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetAcoreString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName); player->GetSession()->SendAreaTriggerMessage(LANG_INSTANCE_RAID_GROUP_ONLY, mapName);
LOG_DEBUG("maps", "MAP: Player '{}' must be in a raid group to enter instance '{}'", player->GetName(), mapName); LOG_DEBUG("maps", "MAP: Player '{}' must be in a raid group to enter instance '{}'", player->GetName(), mapName);
return Map::CANNOT_ENTER_NOT_IN_RAID; return Map::CANNOT_ENTER_NOT_IN_RAID;
} }

2
src/server/game/Server/WorldSession.h
View File

@@ -352,7 +352,7 @@ public:
void SendAreaTriggerMessage(std::string_view str); void SendAreaTriggerMessage(std::string_view str);
template<typename... Args> template<typename... Args>
void SendAreaTriggerMessage(std::string fmt, Args&&... args) void SendAreaTriggerMessage(char const* fmt, Args&&... args)
{ {
if (!m_playerLoading) if (!m_playerLoading)
SendAreaTriggerMessage(Acore::StringFormat(fmt, std::forward<Args>(args)...)); SendAreaTriggerMessage(Acore::StringFormat(fmt, std::forward<Args>(args)...));