OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 15:49:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add event call helper

Browse source 
This simplifies new event calling by reducing the diff to actually fire the event and check for cancelled state.
This commit is contained in:
Aikar 2016-03-18 00:24:00 -04:00
parent 36f0b8144d
commit b4d1aa418a
1 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Spigot-API-Patches/0024-Add-a-call-helper-to-Event.patch Normal file
View file

@ -0,0 +1,44 @@
From 82df1be4b32c98bc98852d11792b42808db38322 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 19 May 2013 20:36:58 -0400
Subject: [PATCH] Add a call helper to Event
Reduces diff in Server patches
diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
index 6677e1b..eaf6c49 100644
--- a/src/main/java/org/bukkit/event/Event.java
+++ b/src/main/java/org/bukkit/event/Event.java
@@ -1,5 +1,6 @@
package org.bukkit.event;
+import org.bukkit.Bukkit;
import org.bukkit.plugin.PluginManager;
/**
@@ -33,6 +34,22 @@ public abstract class Event {
this.async = isAsync;
}
+ // Paper start
+ /**
+ * Calls the event and tests if cancelled.
+ *
+ * @return if event was cancelled, if cancellable. otherwise true.
+ */
+ public boolean callEvent() {
+ Bukkit.getPluginManager().callEvent(this);
+ if (this instanceof Cancellable) {
+ return !((Cancellable) this).isCancelled();
+ } else {
+ return true;
+ }
+ }
+ // Paper end
+
/**
* Convenience method for providing a user-friendly identifier. By
* default, it is the event's class's {@linkplain Class#getSimpleName()
--
2.7.3