Skip to content

Commit 3392aa1

Browse files
authored
fix: conduit being waterlogged all the time (#1808)
1 parent 471c65e commit 3392aa1

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
use crate::block::{BlockBehaviour, BlockFuture, OnPlaceArgs};
2+
use pumpkin_data::block_properties::BlockProperties;
3+
use pumpkin_macros::pumpkin_block;
4+
use pumpkin_world::BlockStateId;
5+
6+
#[pumpkin_block("minecraft:conduit")]
7+
pub struct ConduitBlock;
8+
9+
impl BlockBehaviour for ConduitBlock {
10+
fn on_place<'a>(&'a self, args: OnPlaceArgs<'a>) -> BlockFuture<'a, BlockStateId> {
11+
Box::pin(async move {
12+
let mut props =
13+
pumpkin_data::block_properties::MangroveRootsLikeProperties::default(args.block);
14+
props.r#waterlogged = args.replacing.water_source();
15+
16+
props.to_state_id(args.block)
17+
})
18+
}
19+
}

pumpkin/src/block/blocks/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pub mod chiseled_bookshelf;
1414
pub mod cobweb;
1515
pub mod command;
1616
pub mod composter;
17+
pub mod conduit;
1718
pub mod crafting_table;
1819
pub mod dirt_path;
1920
pub mod doors;

pumpkin/src/block/registry.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use crate::block::blocks::chests::{ChestBlock, CopperChestBlock, TrappedChestBlo
1414
use crate::block::blocks::chiseled_bookshelf::ChiseledBookshelfBlock;
1515
use crate::block::blocks::command::CommandBlock;
1616
use crate::block::blocks::composter::ComposterBlock;
17+
use crate::block::blocks::conduit::ConduitBlock;
1718
use crate::block::blocks::dirt_path::DirtPathBlock;
1819
use crate::block::blocks::doors::DoorBlock;
1920
use crate::block::blocks::end_portal::EndPortalBlock;
@@ -261,6 +262,7 @@ pub fn default_registry() -> Arc<BlockRegistry> {
261262
manager.register(FungusBlock);
262263
manager.register(NetherSproutsBlock);
263264
manager.register(SporeBlossomBlock);
265+
manager.register(ConduitBlock);
264266

265267
manager.register(FallingBlock);
266268

0 commit comments

Comments
 (0)