mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 11:42:55 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 71c0afbf707a3bb5c2b3d01f144acf3bd6d60bc4 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.21.0
|
|
|