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

implement event cancelling for java plugins

Browse Source 
propagate cancellation state from java bukkit events back to pumpkin
events. when a java plugin calls event.setCancelled(true), the
cancellation is now properly applied to the underlying pumpkin event.

- add Cancellable trait bound to PatchBukkitEventHandler
- call event.set_cancelled(true) when java event is cancelled
This commit is contained in:
Purdze 2026-02-03 13:16:02 +00:00
parent eb44131801
commit 2dc589830e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rust/src/events/handler.rs
View File

@ -2,7 +2,7 @@ use std::marker::PhantomData;
use std::sync::Arc; use std::sync::Arc;
use pumpkin::entity::player::Player; use pumpkin::entity::player::Player;
use pumpkin::plugin::{BoxFuture, EventHandler, Payload}; use pumpkin::plugin::{BoxFuture, Cancellable, EventHandler, Payload};
use pumpkin::server::Server; use pumpkin::server::Server;
use pumpkin_api_macros::with_runtime; use pumpkin_api_macros::with_runtime;
use tokio::sync::{mpsc, oneshot}; use tokio::sync::{mpsc, oneshot};
@ -51,7 +51,7 @@ impl<E: IntoEventData> PatchBukkitEventHandler<E> {
#[with_runtime(global)] #[with_runtime(global)]
impl<E> EventHandler<E> for PatchBukkitEventHandler<E> impl<E> EventHandler<E> for PatchBukkitEventHandler<E>
where where
E: IntoEventData + Payload + 'static, E: IntoEventData + Payload + Cancellable + 'static,
{ {
fn handle_blocking<'a>( fn handle_blocking<'a>(
&'a self, &'a self,
@ -78,6 +78,7 @@ where
Ok(cancelled) => { Ok(cancelled) => {
if cancelled { if cancelled {
log::debug!("Event was cancelled by a Java plugin"); log::debug!("Event was cancelled by a Java plugin");
event.set_cancelled(true);
} }
} }
Err(_) => { Err(_) => {