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:
e28fb3bd SPIGOT-5301: BlockIgniteEvent for campfire + arrow

CraftBukkit Changes:
763e5601 SPIGOT-5294: Cancelled EntityPickupItemEvent and PlayerPickupItemEvent alter on-ground stacks
403ac185 SPIGOT-5301: BlockIgniteEvent for campfire + arrow
This commit is contained in:
Shane Freeder
2019-09-02 17:28:24 +01:00
parent 14e07afd20
commit 439131c704
5 changed files with 14 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
From 414ebdf970619b7b3b67ae5b72c3feb24bd2e7fa Mon Sep 17 00:00:00 2001
From 248e1e4123112a83ab0016d5cd39bde1bce46469 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@@ -168,10 +168,10 @@ index e610c8aae..ce35e6bbc 100644
// Check if the fromWorld and toWorld are the same.
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index e58dac2c8..9f39cfa45 100644
index 87de825d5..f6e17986b 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1263,8 +1263,19 @@ public class CraftEventFactory {
@@ -1266,8 +1266,19 @@ public class CraftEventFactory {
return event;
}