pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 06:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uleat 2019-10-30 19:19:17 -04:00
commit 384b1b89c7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/net/tcp_connection.cpp
View File

@ -203,6 +203,10 @@ int EQ::Net::TCPConnection::LocalPort() const
std::string EQ::Net::TCPConnection::RemoteIP() const std::string EQ::Net::TCPConnection::RemoteIP() const
{ {
if (!m_socket) {
return "";
}
sockaddr_storage addr; sockaddr_storage addr;
int addr_len = sizeof(addr); int addr_len = sizeof(addr);
uv_tcp_getpeername(m_socket, (sockaddr*)&addr, &addr_len); uv_tcp_getpeername(m_socket, (sockaddr*)&addr, &addr_len);

10
zone/command.cpp
View File

@ -7431,11 +7431,11 @@ void command_roambox(Client *c, const Seperator *sep)
delay = {} delay = {}
WHERE id = {} WHERE id = {}
), ),
box_size, (box_size / 2),
npc->GetX() - 100, npc->GetX() - (box_size / 2),
npc->GetX() + 100, npc->GetX() + (box_size / 2),
npc->GetY() - 100, npc->GetY() - (box_size / 2),
npc->GetY() + 100, npc->GetY() + (box_size / 2),
delay, delay,
spawn_group_id spawn_group_id
); );