diff --git a/zone/client.cpp b/zone/client.cpp index fef09f14d..a413c7899 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -56,6 +56,7 @@ extern volatile bool RunLoops; #include "quest_parser_collection.h" #include "queryserv.h" #include "mob_movement_manager.h" +#include "../common/content/world_content_service.h" extern QueryServ* QServ; extern EntityList entity_list; @@ -9427,7 +9428,12 @@ void Client::ShowDevToolsMenu() * Print menu */ SendChatLineBreak(); - Message(Chat::White, "| [Devtools] Window %s Show this menu with %s", window_toggle_command.c_str(), EQ::SayLinkEngine::GenerateQuestSaylink("#dev", false, "#dev").c_str()); + Message( + Chat::White, "| [Devtools] Window %s Show this menu with %s | Current expansion [%s]", + window_toggle_command.c_str(), + EQ::SayLinkEngine::GenerateQuestSaylink("#dev", false, "#dev").c_str(), + content_service.GetCurrentExpansionName().c_str() + ); Message(Chat::White, "| [Devtools] Search %s", menu_commands_search.c_str()); Message(Chat::White, "| [Devtools] Show %s", menu_commands_show.c_str()); Message(Chat::White, "| [Devtools] Reload %s", reload_commands_show.c_str()); @@ -9437,4 +9443,4 @@ void Client::ShowDevToolsMenu() void Client::SendChatLineBreak(uint16 color) { Message(color, "------------------------------------------------"); -} \ No newline at end of file +} diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 2e0b46d78..ac8732e82 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -336,6 +336,10 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { } } + if (content_service.GetCurrentExpansion() >= Expansion::Classic && GetGM()) { + LogInfo("[{}] Bypassing Expansion zone checks because GM status is set", GetCleanName()); + } + if(myerror == 1) { //we have successfully zoned DoZoneSuccess(zc, target_zone_id, target_instance_id, dest_x, dest_y, dest_z, dest_h, ignorerestrictions);