Pumpkin-MC/Pumpkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to combat deadlocks

Browse Source
This commit is contained in:
Edvin Bryntesson 2024-09-05 17:16:46 +02:00
parent 602c1c0859
commit d3ec4961cf
No known key found for this signature in database
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pumpkin/src/client/container.rs
View File

@ -330,7 +330,23 @@ impl Player {
// TODO: Figure out better way to get only the players from player_ids
// Also refactor out a better method to get individual advanced state ids
for player in self.world.lock().await.current_players.values() {
let world = self.world.lock().await;
let players = world
.current_players
.iter()
.filter_map(|(token, player)| {
if player_ids.contains(&(token.0 as i32)) {
Some(player.clone())
} else {
None
}
})
.collect_vec();
std::mem::drop(world);
for player in players {
dbg!("really shouldn't be here");
let mut player = player.lock().unwrap();
let mut container =
OptionallyCombinedContainer::new(&mut self.inventory, Some(container.deref_mut()));
let state_id = container.advance_state_id();
@ -339,11 +355,9 @@ impl Player {
let slot = Slot::from(all_slots[slot_index]);
let packet =
CSetContainerSlot::new(*container.window_type() as i8, state_id, slot_index, &slot);
let mut player = player.lock().or(Err(InventoryError::LockError))?;
if player_ids.contains(&player.entity_id()) {
player.client.send_packet(&packet)
}
player.client.send_packet(&packet)
}
dbg!("got here");
Ok(())
}