mirror of
https://github.com/Redot-Engine/redot-engine.git
synced 2025-12-06 15:21:56 -05:00
Merge commit godotengine/godot@2d3bdcac35
This commit is contained in:
@@ -74,8 +74,8 @@ Error ENetConnection::create_host(int p_max_peers, int p_max_channels, int p_in_
|
||||
|
||||
void ENetConnection::destroy() {
|
||||
ERR_FAIL_NULL_MSG(host, "Host already destroyed.");
|
||||
for (List<Ref<ENetPacketPeer>>::Element *E = peers.front(); E; E = E->next()) {
|
||||
E->get()->_on_disconnect();
|
||||
for (const Ref<ENetPacketPeer> &peer : peers) {
|
||||
peer->_on_disconnect();
|
||||
}
|
||||
peers.clear();
|
||||
enet_host_destroy(host);
|
||||
@@ -322,14 +322,10 @@ Error ENetConnection::_create(ENetAddress *p_address, int p_max_peers, int p_max
|
||||
}
|
||||
|
||||
Array ENetConnection::_service(int p_timeout) {
|
||||
Array out;
|
||||
Event event;
|
||||
Ref<ENetPacketPeer> peer;
|
||||
EventType ret = service(p_timeout, event);
|
||||
out.push_back(ret);
|
||||
out.push_back(event.peer);
|
||||
out.push_back(event.data);
|
||||
out.push_back(event.channel_id);
|
||||
Array out = { ret, event.peer, event.data, event.channel_id };
|
||||
if (event.packet && event.peer.is_valid()) {
|
||||
event.peer->_queue_packet(event.packet);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user