Merge branch 'master' of https://github.com/EQEmu/Server

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);

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
 			);