SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
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

Please note that this build includes changes to meet upstreams
requirements for nullability annotations. While we aim for a level of
accuracy, these might not be 100% correct, if there are any issues,
please speak to us on discord, or open an issue on the tracker to
discuss.

Bukkit Changes:
9a6a1de3 Remove nullability annotations from enum constructors
3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API

CraftBukkit Changes:
8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep
8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals
39a287b7 Don't ignore newlines in PlayerListHeader/Footer

Spigot Changes:
cf694d87 Add nullability annotations
This commit is contained in:
Shane Freeder
2019-03-20 00:28:15 +00:00
parent 2b722719b3
commit a7ba5db3de
260 changed files with 2328 additions and 2021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-API-Patches/Add-TNTPrimeEvent.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
new file mode 100644
index 00000000..2ae8826b
index 000000000..73dabb82c
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
@@ -0,0 +0,0 @@
@@ -17,6 +17,8 @@ index 00000000..2ae8826b
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.block.BlockEvent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Called when TNT block is about to turn into {@link org.bukkit.entity.TNTPrimed}
@@ -29,10 +31,10 @@ index 00000000..2ae8826b
+public class TNTPrimeEvent extends BlockEvent implements Cancellable {
+ private static final HandlerList handlers = new HandlerList();
+ private boolean cancelled;
+ private PrimeReason reason;
+ private Entity primerEntity;
+ @NotNull private PrimeReason reason;
+ @Nullable private Entity primerEntity;
+
+ public TNTPrimeEvent(Block theBlock, PrimeReason reason, Entity primerEntity) {
+ public TNTPrimeEvent(@NotNull Block theBlock, @NotNull PrimeReason reason, @Nullable Entity primerEntity) {
+ super(theBlock);
+ this.reason = reason;
+ this.primerEntity = primerEntity;
@@ -43,6 +45,7 @@ index 00000000..2ae8826b
+ *
+ * @return Prime reason
+ */
+ @NotNull
+ public PrimeReason getReason() {
+ return this.reason;
+ }
@@ -56,6 +59,7 @@ index 00000000..2ae8826b
+ *
+ * @return The {@link Entity} who primed the TNT
+ */
+ @Nullable
+ public Entity getPrimerEntity() {
+ return this.primerEntity;
+ }
@@ -80,11 +84,13 @@ index 00000000..2ae8826b
+ this.cancelled = cancel;
+ }
+
+ @Nullable
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ @Nullable
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }