geforkt von Mirrors/Paper
45 Zeilen
1.2 KiB
Diff
45 Zeilen
1.2 KiB
Diff
|
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
|
||
|
|
|