Updated Upstream (Bukkit/CraftBukkit/Spigot)
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: 4543fb40 SPIGOT-4943: Zombie villager conversion player API. CraftBukkit Changes: 585b2ebd Tweak thresholds for can't keep up message 91ada5c2 SPIGOT-4956: EntityTameEvent not triggered when taming a Cat 9bda4134 SPIGOT-4943: Zombie villager conversion player API. 5a027071 SPIGOT-4947: Allow setting the content on a lectern 09d00e9f SPIGOT-4938: Call EntityPickupItemEvent for dolphins a278e445 SPIGOT-4948: Lectern.getInventory should return a LecternInventory Spigot Changes: 4f661b22 Rebuild patches
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From ae262d3e841a81051fe5bd507310cd19198e5c9b Mon Sep 17 00:00:00 2001
|
||||
From f49837ffa30f83b202f8586e3ba022e4d7f9b29b 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 be7c5d174..ba60ece45 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 00879c7f8..ceffcec72 100644
|
||||
index ef62edec4..dc83a90a4 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -1239,8 +1239,19 @@ public class CraftEventFactory {
|
||||
@@ -1241,8 +1241,19 @@ public class CraftEventFactory {
|
||||
return event;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user