mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-24 09:58:00 +01:00
57dd397155
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From edbedec7fd2d9d2b495d81f52c8662429eb2937d 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 18d0636b7..8ec56cd6b 100644
|
|
--- a/src/main/java/org/bukkit/event/Event.java
|
|
+++ b/src/main/java/org/bukkit/event/Event.java
|
|
@@ -35,6 +35,22 @@ public abstract class Event {
|
|
this.async = isAsync;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Calls the event and tests if cancelled.
|
|
+ *
|
|
+ * @return false if event was cancelled, if cancellable. otherwise true.
|
|
+ */
|
|
+ public boolean callEvent() {
|
|
+ org.bukkit.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.26.2
|
|
|