Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads
3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495
e470f1ef Add more information to Timing Reports
f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers
a4fe910f Fix sounds when using worldedit regen command
70ad51a8 Updated Upstream (Bukkit/CraftBukkit)
d7cfa4fa Improve legacy format serialization more
This commit is contained in:
William Blake Galbreath
2020-06-05 21:41:54 -05:00
parent c2c6a6efd9
commit c0c212bf48
161 changed files with 754 additions and 759 deletions

View File

@@ -1,33 +0,0 @@
From da805501e85eb43e4d89693f7116ecc95fb3aa2c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:36 -0500
Subject: [PATCH] Add getPlacementBlockData to World
---
src/main/java/org/bukkit/World.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index cf0d18283..3a7226cc9 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3390,6 +3390,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
@NotNull
net.pl3x.purpur.MoonPhase getMoonPhase();
+
+ /**
+ * Get the hypothetical BlockData that would apply if one tries to set the given BlockData
+ *
+ * @param blockData BlockData to try
+ * @param location Location to check
+ * @return Valid BlockData for location
+ */
+ @NotNull
+ BlockData getPlacementBlockData(@NotNull BlockData blockData, @NotNull Location location);
// Purpur end
/**
--
2.24.0