mirror of
https://github.com/IntQuant/noita_entangled_worlds.git
synced 2025-10-19 07:03:16 +00:00
crash if my_id is none, it used to freeze up, use ? where unwrap() is available, update packages
This commit is contained in:
bgkillas
parent
5d362925bf
commit
dee32b0433
5 changed files with 36 additions and 43 deletions
51
noita-proxy/Cargo.lock
generated
51
noita-proxy/Cargo.lock
generated
|
|
@ -442,9 +442,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.8"
|
||||
version = "1.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549"
|
||||
checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292"
|
||||
dependencies = [
|
||||
"jobserver",
|
||||
"libc",
|
||||
|
|
@ -561,9 +561,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "core-foundation-sys"
|
||||
version = "0.8.6"
|
||||
version = "0.8.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
|
||||
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||
|
||||
[[package]]
|
||||
name = "core-graphics"
|
||||
|
|
@ -694,19 +694,6 @@ version = "1.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
|
||||
|
||||
[[package]]
|
||||
name = "dashmap"
|
||||
version = "5.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"hashbrown",
|
||||
"lock_api",
|
||||
"once_cell",
|
||||
"parking_lot_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dashmap"
|
||||
version = "6.0.1"
|
||||
|
|
@ -2013,7 +2000,7 @@ dependencies = [
|
|||
"clipboard",
|
||||
"crc",
|
||||
"crossbeam",
|
||||
"dashmap 6.0.1",
|
||||
"dashmap",
|
||||
"eframe",
|
||||
"egui-file-dialog",
|
||||
"egui_extras",
|
||||
|
|
@ -2401,9 +2388,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "polling"
|
||||
version = "3.7.2"
|
||||
version = "3.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
|
||||
checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"concurrent-queue",
|
||||
|
|
@ -2411,7 +2398,7 @@ dependencies = [
|
|||
"pin-project-lite",
|
||||
"rustix",
|
||||
"tracing",
|
||||
"windows-sys 0.52.0",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2939,18 +2926,18 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.204"
|
||||
version = "1.0.206"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
|
||||
checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.204"
|
||||
version = "1.0.206"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
|
||||
checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -3201,9 +3188,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.72"
|
||||
version = "2.0.74"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
|
||||
checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -3236,7 +3223,7 @@ version = "0.2.0"
|
|||
dependencies = [
|
||||
"bincode",
|
||||
"crossbeam",
|
||||
"dashmap 5.5.3",
|
||||
"dashmap",
|
||||
"serde",
|
||||
"test-log",
|
||||
"tracing",
|
||||
|
|
@ -3681,9 +3668,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
|
|||
|
||||
[[package]]
|
||||
name = "ureq"
|
||||
version = "2.10.0"
|
||||
version = "2.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea"
|
||||
checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"flate2",
|
||||
|
|
@ -4440,9 +4427,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "xcursor"
|
||||
version = "0.3.6"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7"
|
||||
checksum = "f513f231f0810b04d988f0df4fb16ef0b6b25d23248f2c4b56b074e6b1b0ffe4"
|
||||
|
||||
[[package]]
|
||||
name = "xkbcommon-dl"
|
||||
|
|
|
|||
|
|
@ -299,8 +299,7 @@ fn mod_downloader_for(
|
|||
) -> Result<Downloader, ReleasesError> {
|
||||
let client = reqwest::blocking::Client::builder()
|
||||
.timeout(None)
|
||||
.build()
|
||||
.unwrap();
|
||||
.build()?;
|
||||
get_release_by_tag(&client, tag)
|
||||
.and_then(|release| release.get_release_assets(&client))
|
||||
.and_then(|asset_list| asset_list.find_by_name("quant.ew.zip").cloned())
|
||||
|
|
|
|||
|
|
@ -162,8 +162,7 @@ fn proxy_bin_name() -> &'static str {
|
|||
fn proxy_downloader_for(download_path: PathBuf) -> Result<Downloader, ReleasesError> {
|
||||
let client = reqwest::blocking::Client::builder()
|
||||
.timeout(None)
|
||||
.build()
|
||||
.unwrap();
|
||||
.build()?;
|
||||
get_latest_release(&client)
|
||||
.and_then(|release| release.get_release_assets(&client))
|
||||
.and_then(|asset_list| asset_list.find_by_name(proxy_asset_name()).cloned())
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ use std::{
|
|||
thread::{self, JoinHandle},
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
use tracing::debug;
|
||||
use world::{world_info::WorldInfo, NoitaWorldUpdate, WorldManager};
|
||||
|
||||
use tangled::Reliability;
|
||||
|
|
@ -164,9 +163,18 @@ impl NetManager {
|
|||
|
||||
let local_server: TcpListener = socket.into();
|
||||
|
||||
while self.peer.my_id().is_none() {
|
||||
info!("Waiting on my_id...");
|
||||
thread::sleep(Duration::from_millis(100));
|
||||
for _ in 1..3
|
||||
{
|
||||
if self.peer.my_id().is_none() {
|
||||
info!("Waiting on my_id...");
|
||||
thread::sleep(Duration::from_millis(100));
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
if self.peer.my_id().is_none()
|
||||
{
|
||||
std::process::exit(1)
|
||||
}
|
||||
|
||||
let is_host = self.is_host();
|
||||
|
|
@ -369,7 +377,7 @@ impl NetManager {
|
|||
}
|
||||
// Broadcast
|
||||
2 => {
|
||||
let msg_to_send = if false {
|
||||
let msg_to_send =/* if false {
|
||||
let compressed = lz4_flex::compress_prepend_size(&msg[1..]);
|
||||
|
||||
debug!(
|
||||
|
|
@ -379,7 +387,7 @@ impl NetManager {
|
|||
);
|
||||
|
||||
NetMsg::ModCompressed { data: compressed }
|
||||
} else {
|
||||
} else*/ {
|
||||
NetMsg::ModRaw {
|
||||
data: msg[1..].to_owned(),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ name = "chat"
|
|||
[dependencies]
|
||||
crossbeam = "0.8.2"
|
||||
tracing = "0.1.36"
|
||||
dashmap = "5.3.4"
|
||||
dashmap = "6.0.1"
|
||||
serde = {features = ["derive"], version = "1.0.142"}
|
||||
bincode = "1.3.3"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue