diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index 50ed43d8..18c4042d 100644 --- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -456,6 +456,12 @@ void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_R player.sendUrgent( "No zone instance found for " + std::to_string( param1 ) ); break; } + + if( !pTeriMgr->isDefaultTerritory( param1 ) ) + { + player.sendUrgent( pZone->getName() + " is an instanced area - instance ID required to zone in." ); + break; + } bool doTeleport = false; uint16_t teleport; diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h index 3ecebdfd..c78e3923 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h +++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h @@ -29,7 +29,7 @@ class TerritoryMgr public: enum TerritoryIntendedUse : - uint8_t //ToDo: Add The Rest of The Territory Types and Have Better Names For Them + uint8_t //TODO: Add the rest of the territory types and have better names for them { Town = 0, OpenWorld = 1,