Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-26 22:23:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #52613 from V-Sekai/fix_custom_sync_commands

Browse Source 
Fix custom multiplayer sync commands
This commit is contained in:
Fabio Alessandrelli 2021-09-14 21:27:12 +02:00 committed by GitHub
commit c5a979eba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/multiplayer/multiplayer_replicator.cpp
View File

@ -350,9 +350,9 @@ void MultiplayerReplicator::process_sync(int p_from, const uint8_t *p_packet, in
}
}
PackedByteArray pba;
pba.resize(p_packet_len - SPAWN_CMD_OFFSET);
pba.resize(p_packet_len - SYNC_CMD_OFFSET);
if (pba.size()) {
memcpy(pba.ptrw(), p_packet, p_packet_len - SPAWN_CMD_OFFSET);
memcpy(pba.ptrw(), p_packet + SYNC_CMD_OFFSET, p_packet_len - SYNC_CMD_OFFSET);
}
Variant args[4] = { p_from, id, objs, pba };
Variant *argp[4] = { args, &args[1], &args[2], &args[3] };
@ -749,6 +749,9 @@ Error MultiplayerReplicator::send_sync(int p_peer_id, const ResourceUID::ID &p_s
uint8_t *ptr = packet_cache.ptrw();
ptr[0] = MultiplayerAPI::NETWORK_COMMAND_SYNC;
encode_uint64(p_scene_id, &ptr[1]);
if (p_data.size()) {
memcpy(&ptr[SYNC_CMD_OFFSET], p_data.ptr(), p_data.size());
}
Ref<MultiplayerPeer> peer = multiplayer->get_multiplayer_peer();
peer->set_target_peer(p_peer_id);
peer->set_transfer_channel(p_channel);