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

actually fixed deadlock

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

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

@ -110,7 +110,6 @@ impl Player {
let mut opened_container = self let mut opened_container = self
.get_open_container(server) .get_open_container(server)
.map(|container| container.lock().unwrap()); .map(|container| container.lock().unwrap());
let mut opened_container = opened_container.as_deref_mut();
let drag_handler = &server.drag_handler; let drag_handler = &server.drag_handler;
let current_state_id = if let Some(container) = opened_container.as_ref() { let current_state_id = if let Some(container) = opened_container.as_ref() {
@ -144,18 +143,20 @@ impl Player {
match click.click_type { match click.click_type {
ClickType::MouseClick(mouse_click) => { ClickType::MouseClick(mouse_click) => {
self.mouse_click(opened_container, mouse_click, click.slot) self.mouse_click(opened_container.as_deref_mut(), mouse_click, click.slot)
}
ClickType::ShiftClick => {
self.shift_mouse_click(opened_container.as_deref_mut(), click.slot)
} }
ClickType::ShiftClick => self.shift_mouse_click(opened_container, click.slot),
ClickType::KeyClick(key_click) => match click.slot { ClickType::KeyClick(key_click) => match click.slot {
container_click::Slot::Normal(slot) => { container_click::Slot::Normal(slot) => {
self.number_button_pressed(opened_container, key_click, slot) self.number_button_pressed(opened_container.as_deref_mut(), key_click, slot)
} }
container_click::Slot::OutsideInventory => Err(InventoryError::InvalidPacket), container_click::Slot::OutsideInventory => Err(InventoryError::InvalidPacket),
}, },
ClickType::CreativePickItem => { ClickType::CreativePickItem => {
if let container_click::Slot::Normal(slot) = click.slot { if let container_click::Slot::Normal(slot) = click.slot {
self.creative_pick_item(opened_container, slot) self.creative_pick_item(opened_container.as_deref_mut(), slot)
} else { } else {
Err(InventoryError::InvalidPacket) Err(InventoryError::InvalidPacket)
} }
@ -168,10 +169,11 @@ impl Player {
} }
} }
ClickType::MouseDrag { drag_state } => { ClickType::MouseDrag { drag_state } => {
self.mouse_drag(drag_handler, opened_container, drag_state) self.mouse_drag(drag_handler, opened_container.as_deref_mut(), drag_state)
} }
ClickType::DropType(_drop_type) => todo!(), ClickType::DropType(_drop_type) => todo!(),
}?; }?;
std::mem::drop(opened_container);
if let container_click::Slot::Normal(slot) = click.slot { if let container_click::Slot::Normal(slot) = click.slot {
self.send_container_changes(server, slot).await?; self.send_container_changes(server, slot).await?;
} }
@ -357,7 +359,6 @@ impl Player {
CSetContainerSlot::new(*container.window_type() as i8, state_id, slot_index, &slot); CSetContainerSlot::new(*container.window_type() as i8, state_id, slot_index, &slot);
player.client.send_packet(&packet) player.client.send_packet(&packet)
} }
dbg!("got here");
Ok(()) Ok(())
} }