Stowage/noita_entangled_worlds
2
0
Fork 0
mirror of https://github.com/IntQuant/noita_entangled_worlds.git synced 2025-10-19 07:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

maybe fix world sync being weird sometimes???

Browse source
This commit is contained in:
bgkillas 2024-09-22 06:45:49 -04:00
parent d44dc65f7d
commit 7ba48e1d27
1 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

33
noita-proxy/src/net/world.rs
View file

@ -55,10 +55,16 @@ pub(crate) enum WorldNetMessage {
chunk_data: Option<ChunkData>,
priority: u8,
},
// Tell host that someone is losing authority
RelinquishAuthority {
chunk: ChunkCoord,
chunk_data: Option<ChunkData>,
},
// Ttell how to update a chunk storage
UpdateStorage {
chunk: ChunkCoord,
chunk_data: Option<ChunkData>,
},
// When listening
AuthorityAlreadyTaken {
chunk: ChunkCoord,
@ -175,8 +181,8 @@ impl WorldManager {
let chunk_storage = save_state.load().unwrap_or_default();
WorldManager {
is_host,
my_pos: (i32::MIN + 3, i32::MIN + 3),
cam_pos: (i32::MIN + 3, i32::MIN + 3),
my_pos: (i32::MIN / 2, i32::MIN / 2),
cam_pos: (i32::MIN / 2, i32::MIN / 2),
my_peer_id,
save_state,
inbound_model: Default::default(),
@ -589,14 +595,28 @@ impl WorldManager {
self.chunk_state
.insert(chunk, ChunkState::authority(priority));
self.last_request_priority.remove(&chunk);
let chunk_data = self.outbound_model.get_chunk_data(chunk);
self.emit_msg(
Destination::Host,
WorldNetMessage::UpdateStorage { chunk, chunk_data },
);
} else {
let chunk_data = self.outbound_model.get_chunk_data(chunk);
self.emit_msg(
Destination::Host,
WorldNetMessage::RelinquishAuthority { chunk, chunk_data },
WorldNetMessage::UpdateStorage { chunk, chunk_data },
);
}
}
WorldNetMessage::UpdateStorage {chunk, chunk_data} => {
if !self.is_host {
warn!("{} sent RelinquishAuthority to not-host.", source);
return;
}
if let Some(chunk_data) = chunk_data {
self.chunk_storage.insert(chunk, chunk_data);
}
}
WorldNetMessage::RelinquishAuthority { chunk, chunk_data } => {
if !self.is_host {
warn!("{} sent RelinquishAuthority to not-host.", source);
@ -807,6 +827,11 @@ impl WorldManager {
},
);
self.last_request_priority.remove(&chunk);
let chunk_data = self.outbound_model.get_chunk_data(chunk);
self.emit_msg(
Destination::Host,
WorldNetMessage::UpdateStorage { chunk, chunk_data },
);
}
WorldNetMessage::TransferFailed { chunk } => {
warn!("Transfer failed, requesting authority normally");
@ -894,4 +919,4 @@ impl Drop for WorldManager {
impl SaveStateEntry for FxHashMap<ChunkCoord, ChunkData> {
const FILENAME: &'static str = "world_chunks";
}
}