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

Avoid duplicate BlockBreakEvent and honor drop flag

Browse Source
This commit is contained in:
yunuservices
2026-02-05 08:13:38 +03:00
parent 23a0d7f983
commit 2431d4a9c5
2 changed files with 15 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
pumpkin/src/net/java/play.rs
View File

@@ -1588,29 +1588,12 @@ impl JavaClient {
// TODO: do validation
// TODO: Config
if player.gamemode.load() == GameMode::Creative {
let block_break_event = crate::plugin::block::block_break::BlockBreakEvent::new(
Some(player.clone()),
block,
position,
0,
false,
);
let block_break_event =
server.plugin_manager.fire(block_break_event).await;
if block_break_event.cancelled {
self.update_sequence(player, player_action.sequence.0);
return;
}
// Block break & play sound
world
.break_block(
&position,
Some(player.clone()),
if block_break_event.drop {
BlockFlags::NOTIFY_NEIGHBORS
} else {
BlockFlags::NOTIFY_NEIGHBORS | BlockFlags::SKIP_DROPS
},
BlockFlags::NOTIFY_NEIGHBORS | BlockFlags::SKIP_DROPS,
)
.await;
server
@@ -1642,30 +1625,12 @@ impl JavaClient {
}
// Instant break
if block_damage_event.insta_break {
let block_break_event =
crate::plugin::block::block_break::BlockBreakEvent::new(
Some(player.clone()),
block,
position,
0,
true,
);
let block_break_event =
server.plugin_manager.fire(block_break_event).await;
if block_break_event.cancelled {
self.update_sequence(player, player_action.sequence.0);
return;
}
let broken_state = world.get_block_state(&position).await;
world
.break_block(
&position,
Some(player.clone()),
if block_break_event.drop {
BlockFlags::NOTIFY_NEIGHBORS
} else {
BlockFlags::SKIP_DROPS | BlockFlags::NOTIFY_NEIGHBORS
},
BlockFlags::NOTIFY_NEIGHBORS,
)
.await;
server
@@ -1740,21 +1705,6 @@ impl JavaClient {
let block_drop = player.gamemode.load() != GameMode::Creative
&& player.can_harvest(state, block).await;
let block_break_event = crate::plugin::block::block_break::BlockBreakEvent::new(
Some(player.clone()),
block,
location,
0,
block_drop,
);
let block_break_event = server.plugin_manager.fire(block_break_event).await;
if block_break_event.cancelled {
world.set_block_breaking(entity, location, -1).await;
self.update_sequence(player, player_action.sequence.0);
return;
}
let block_drop = block_break_event.drop;
if block_drop {
if let Some(server) = world.server.upgrade() {
let tool = player.inventory.held_item().lock().await.clone();

14
pumpkin/src/world/mod.rs
View File

@@ -2979,7 +2979,13 @@ impl World {
flags: BlockFlags,
) -> Option<u16> {
let (broken_block, broken_block_state) = self.get_block_and_state_id(position).await;
let event = BlockBreakEvent::new(cause.clone(), broken_block, *position, 0, false);
let event = BlockBreakEvent::new(
cause.clone(),
broken_block,
*position,
0,
!flags.contains(BlockFlags::SKIP_DROPS),
);
let event = self
.server
@@ -2990,6 +2996,12 @@ impl World {
.await;
if !event.cancelled {
let mut flags = flags;
if event.drop {
flags.remove(BlockFlags::SKIP_DROPS);
} else {
flags.insert(BlockFlags::SKIP_DROPS);
}
let new_state_id = if broken_block
.properties(broken_block_state)
.and_then(|properties| {