35 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
		
		
			
		
	
	
			35 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
| 
								 | 
							
								From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
							 | 
						||
| 
								 | 
							
								--- a/src/main/java/org/bukkit/event/Event.java
							 | 
						||
| 
								 | 
							
								+++ b/src/main/java/org/bukkit/event/Event.java
							 | 
						||
| 
								 | 
							
								@@ -0,0 +0,0 @@ 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()
							 |