From 2a1ab2a0726d76c2be98114259f5d79ae654bbb3 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 15 Apr 2023 01:16:59 -0700
Subject: [PATCH] Fix bug where replies to unknown players went to the wrong
 place

---
 lib/coopnet/linux/libcoopnet.a      | Bin 3642298 -> 3642298 bytes
 src/pc/network/coopnet/coopnet.c    |   2 +-
 src/pc/network/coopnet/coopnet_id.c |   4 ++++
 src/pc/network/coopnet/coopnet_id.h |   1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/coopnet/linux/libcoopnet.a b/lib/coopnet/linux/libcoopnet.a
index b7d682acaa4ea88904140e93dce04150a7a1bef6..ef390ef471d4cbcbfdbeeca651a245819dd5e57f 100644
GIT binary patch
delta 203
zcmWN=#|^?j07XG97%&-|oWqiXmrPrfz~M_AD1-)(kX#J4@J5>W{WCEiGD;{ZPbsC9
zk*}<B%B!HFN-C?O;1fpHcu!|TR#{`64K~?gn;mx9W1j;KIpUZTT249RoC_|w;+h+7
Vxno4fJr6wc#4|6vex1F&?tgNuHbwvd

delta 203
zcmWN=#|^?j07XHToG~V6@REa<Ok0$|;Y%DSga(k1Tnx4FMw;mTGZ7y$iYuX{Qc5eM
zta8e$prT4Dt0GU;j~`kSdphg0#yT5pvc)z#?6Su`2OM(5F((XYIpvIVF1X~1Yi_vZ
Vjv*cQJn+a9&%E&Zb@ukU{{e77HbMXZ

diff --git a/src/pc/network/coopnet/coopnet.c b/src/pc/network/coopnet/coopnet.c
index 51160210..2fb09aca 100644
--- a/src/pc/network/coopnet/coopnet.c
+++ b/src/pc/network/coopnet/coopnet.c
@@ -126,7 +126,7 @@ void ns_coopnet_update(void) {
 static int ns_coopnet_network_send(u8 localIndex, void* address, u8* data, u16 dataLength) {
     if (!coopnet_is_connected()) { return 1; }
     //if (gCurLobbyId == 0) { return 2; }
-    u64 userId = ns_coopnet_get_id(localIndex);
+    u64 userId = coopnet_raw_get_id(localIndex);
     if (localIndex == 0 && address != NULL) { userId = *(u64*)address; }
     coopnet_send_to(userId, data, dataLength);
 
diff --git a/src/pc/network/coopnet/coopnet_id.c b/src/pc/network/coopnet/coopnet_id.c
index c7c79085..ea254ae2 100644
--- a/src/pc/network/coopnet/coopnet_id.c
+++ b/src/pc/network/coopnet/coopnet_id.c
@@ -75,6 +75,10 @@ void coopnet_set_local_user_id(uint64_t userId) {
     sLocalUserId = userId;
 }
 
+s64 coopnet_raw_get_id(u8 localIndex) {
+    return (s64)sNetworkUserIds[localIndex];
+}
+
 s64 ns_coopnet_get_id(u8 localIndex) {
     if (localIndex == 0) { return (s64)sLocalUserId; }
     return (s64)sNetworkUserIds[localIndex];
diff --git a/src/pc/network/coopnet/coopnet_id.h b/src/pc/network/coopnet/coopnet_id.h
index 36ab5643..df5c7c4e 100644
--- a/src/pc/network/coopnet/coopnet_id.h
+++ b/src/pc/network/coopnet/coopnet_id.h
@@ -12,6 +12,7 @@ void coopnet_set_user_id(uint8_t localIndex, uint64_t userId);
 uint64_t coopnet_get_local_user_id(void);
 void coopnet_set_local_user_id(uint64_t userId);
 
+s64 coopnet_raw_get_id(u8 localIndex);
 s64 ns_coopnet_get_id(u8 localIndex);
 void ns_coopnet_save_id(u8 localIndex, s64 networkId);
 void ns_coopnet_clear_id(u8 localIndex);