diff --git a/common/net/tcp_connection.cpp b/common/net/tcp_connection.cpp index 03f8466de..83d6c89b5 100644 --- a/common/net/tcp_connection.cpp +++ b/common/net/tcp_connection.cpp @@ -203,6 +203,10 @@ int EQ::Net::TCPConnection::LocalPort() const std::string EQ::Net::TCPConnection::RemoteIP() const { + if (!m_socket) { + return ""; + } + sockaddr_storage addr; int addr_len = sizeof(addr); uv_tcp_getpeername(m_socket, (sockaddr*)&addr, &addr_len); diff --git a/zone/command.cpp b/zone/command.cpp index 2be3776af..44bdd0dad 100755 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -7431,11 +7431,11 @@ void command_roambox(Client *c, const Seperator *sep) delay = {} WHERE id = {} ), - box_size, - npc->GetX() - 100, - npc->GetX() + 100, - npc->GetY() - 100, - npc->GetY() + 100, + (box_size / 2), + npc->GetX() - (box_size / 2), + npc->GetX() + (box_size / 2), + npc->GetY() - (box_size / 2), + npc->GetY() + (box_size / 2), delay, spawn_group_id );