Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-08 01:17:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix ignoreCancelled option

Browse Source
This commit is contained in:
TheMode 2021-06-09 22:01:46 +02:00
parent 603e3293a6
commit 13350d0ab8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minestom/server/event/EventListener.java
View File

@ -56,7 +56,7 @@ public interface EventListener<T extends Event> {
class Builder<T extends Event> {
private final Class<T> eventType;
private final List<Predicate<T>> filters = new ArrayList<>();
private boolean ignoreCancelled;
private boolean ignoreCancelled = true;
private int expireCount;
private Predicate<T> expireWhen;
private Consumer<T> handler;
@ -78,9 +78,9 @@ public interface EventListener<T extends Event> {
/**
* Specifies if the handler should still be called if {@link CancellableEvent#isCancelled()} returns {@code true}.
* <p>
* Default is set to {@code false}.
* Default is set to {@code true}.
*
* @param ignoreCancelled True to still process the event when cancelled
* @param ignoreCancelled True to stop processing the event when cancelled
*/
@Contract(value = "_ -> this")
public @NotNull EventListener.Builder<T> ignoreCancelled(boolean ignoreCancelled) {
@ -140,7 +140,7 @@ public interface EventListener<T extends Event> {
@Override
public @NotNull Result run(@NotNull T event) {
// Event cancellation
if (!ignoreCancelled && event instanceof CancellableEvent &&
if (ignoreCancelled && event instanceof CancellableEvent &&
((CancellableEvent) event).isCancelled()) {
return Result.INVALID;
}