2016-08-28 01:41:58 +02:00
|
|
|
From 544b5f21dd978f9b7ecd0a546421aa11b5c3a159 Mon Sep 17 00:00:00 2001
|
2016-03-18 05:24:00 +01:00
|
|
|
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.
|
|
|
|
+ *
|
2018-06-18 22:42:39 +02:00
|
|
|
+ * @return false if event was cancelled, if cancellable. otherwise true.
|
2016-03-18 05:24:00 +01:00
|
|
|
+ */
|
|
|
|
+ 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()
|
|
|
|
--
|
2016-08-28 01:41:58 +02:00
|
|
|
2.9.2.windows.1
|
2016-03-18 05:24:00 +01:00
|
|
|
|