Update Upstream

2019-05-05 19:58:04 -07:00
parent 52cd8744e0
commit f9f71eb14e
321 changed files with 809 additions and 856 deletions
--- a/Spigot-API-Patches/Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/Custom-replacement-for-eaten-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items


 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index ee0f95b1..864c0a9e 100644
+index c2793f3e..373f4b5b 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
@@ -0,0 +0,0 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
@@ -43,7 +43,7 @@ index ee0f95b1..864c0a9e 100644
 +    }
 +    // Paper end
 +
+     @Override
     public boolean isCancelled() {
         return this.isCancelled;
-     }
 --