From 99e2fb117ea47bd431a2fc861a686c988b1bd837 Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Thu, 19 Jan 2023 13:06:51 -0300 Subject: [PATCH] myerge agen; --- src/world/Network/Handlers/GMCommandHandlers.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp index 4c7b630e..33bb292f 100644 --- a/src/world/Network/Handlers/GMCommandHandlers.cpp +++ b/src/world/Network/Handlers/GMCommandHandlers.cpp @@ -537,12 +537,8 @@ void Sapphire::Network::GameConnection::gmCommandHandler( const Packets::FFXIVAR } else { -<<<<<<< HEAD auto& warpMgr = Common::Service< WarpMgr >::ref(); warpMgr.requestMoveTerritory( *targetPlayer, WarpType::WARP_TYPE_GM, teriMgr.getZoneByTerritoryTypeId( param1 )->getGuId(), targetPlayer->getPos(), 0 ); -======= - warpMgr.requestMoveTerritory( *targetPlayer, WarpType::WARP_TYPE_GM, teriMgr.getZoneByTerritoryTypeId( param1 )->getGuId(), targetPlayer->getPos(), 0); ->>>>>>> 9ae27baf0358be65e19ee0f323f2242de6695f15 } PlayerMgr::sendServerNotice( player, "{0} was warped to zone {1}", targetPlayer->getName(), param1, pZone->getName() );