majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't block the async runtime when reading inventories (#2851)

Browse Source
This commit is contained in:
xRookieFight
2026-08-09 17:36:02 +03:00
committed by GitHub
parent c75b89fd89
commit d61f8c931f
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/pumpkin-world/src/inventory/simple_inventory.rs
View File

@@ -5,6 +5,7 @@ use tokio::sync::RwLock;
pub struct SimpleInventory {
pub stacks: RwLock<Vec<ItemStack>>,
size: usize,
}
impl SimpleInventory {
@@ -12,6 +13,7 @@ impl SimpleInventory {
pub fn new(size: usize) -> Self {
Self {
stacks: RwLock::new(vec![ItemStack::EMPTY.clone(); size]),
size,
}
}
}
@@ -27,7 +29,7 @@ impl Clearable for SimpleInventory {
impl Inventory for SimpleInventory {
fn size(&self) -> usize {
self.stacks.blocking_read().len()
self.size
}
fn is_empty(&self) -> InventoryFuture<'_, bool> {

26
crates/pumpkin/src/block/entities/brewing_stand.rs
View File

@@ -18,7 +18,7 @@ use pumpkin_data::tag::{self, Taggable};
use pumpkin_nbt::compound::NbtCompound;
use pumpkin_util::math::position::BlockPos;
use pumpkin_util::math::vector3::Vector3;
use pumpkin_world::inventory::{Inventory, sync_write_items_to_nbt};
use pumpkin_world::inventory::{Inventory, sync_read_items_from_nbt, sync_write_items_to_nbt};
use tokio::sync::RwLock;
pub struct BrewingStandBlockEntity {
@@ -332,7 +332,7 @@ impl crate::block::entities::BlockEntity for BrewingStandBlockEntity {
where
Self: Sized,
{
let entity = Self::new(position);
let mut entity = Self::new(position);
// Load brew time / fuel if present in NBT
if let Some(bt) = nbt.get_int("BrewTime") {
@@ -343,28 +343,28 @@ impl crate::block::entities::BlockEntity for BrewingStandBlockEntity {
}
// Load inventory items from NBT
entity.read_data(nbt, &mut *futures::executor::block_on(entity.items.write()));
let items = entity.items.get_mut();
sync_read_items_from_nbt(nbt, items);
let items_guard = futures::executor::block_on(entity.items.read());
// If there's an ingredient in slot 3, remember its base item for matching
if !items_guard[3].is_empty() {
*entity
.ingredient_item
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner) =
Some(items_guard[3].get_item());
}
let ingredient_item = (!items[3].is_empty()).then(|| items[3].get_item());
// Recompute last_potion_count so visuals are correct after load
let mut current: [bool; 3] = [false; 3];
for (i, slot) in items_guard.iter().take(3).enumerate() {
for (i, slot) in items.iter().take(3).enumerate() {
current[i] = !slot.is_empty()
&& (slot
.get_data_component::<pumpkin_data::data_component_impl::PotionContentsImpl>()
.is_some()
|| slot.get_item().id == pumpkin_data::item::Item::GLASS_BOTTLE.id);
}
drop(items_guard);
if let Some(item) = ingredient_item {
*entity
.ingredient_item
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner) = Some(item);
}
*entity
.last_potion_count