diff options
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Commands/cs_go.cpp | 21 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_reload.cpp | 2 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 3b38e1b07e4..b4ca8af6d92 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -564,30 +564,21 @@ public: if (!*args) return false; - char *cstrticket_id = strtok((char*)args, " "); - - if (!cstrticket_id) + char *sTicketId = strtok((char*)args, " "); + if (!sTicketId) return false; - uint64 ticket_id = atoi(cstrticket_id); - if (!ticket_id) + uint32 ticketId = atoi(sTicketId); + if (!ticketId) return false; - GM_Ticket *ticket = sTicketMgr->GetGMTicket(ticket_id); + GmTicket* ticket = sTicketMgr->GetTicket(ticketId); if (!ticket) { handler->SendSysMessage(LANG_COMMAND_TICKETNOTEXIST); return true; } - float x, y, z; - int mapid; - - x = ticket->pos_x; - y = ticket->pos_y; - z = ticket->pos_z; - mapid = ticket->map; - Player* _player = handler->GetSession()->GetPlayer(); if (_player->isInFlight()) { @@ -597,7 +588,7 @@ public: else _player->SaveRecallPosition(); - _player->TeleportTo(mapid, x, y, z, 1, 0); + ticket->TeleportTo(_player); return true; } }; diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 9bd6de9f6be..a08befe24ba 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -166,7 +166,7 @@ public: //reload commands static bool HandleReloadGMTicketsCommand(ChatHandler* /*handler*/, const char* /*args*/) { - sTicketMgr->LoadGMTickets(); + sTicketMgr->LoadTickets(); return true; } |