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

@@ -0,0 +1,38 @@
From 5a78f176845e8317a91657d10012218362479e06 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:28:53 -0500
Subject: [PATCH] Add more evoker API
---
src/main/java/org/bukkit/entity/Evoker.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/Evoker.java b/src/main/java/org/bukkit/entity/Evoker.java
index f8d173adc..f2a03f7f8 100644
--- a/src/main/java/org/bukkit/entity/Evoker.java
+++ b/src/main/java/org/bukkit/entity/Evoker.java
@@ -64,4 +64,21 @@ public interface Evoker extends Spellcaster {
*/
@Deprecated
void setCurrentSpell(@Nullable Spell spell);
+
+ // Purpur start
+ /**
+ * Get the sheep being targeted by the Wololo spell
+ *
+ * @return Targeted sheep
+ */
+ @Nullable
+ Sheep getWololoTarget();
+
+ /**
+ * Set the sheep targeted by the Wololo spell
+ *
+ * @param sheep Sheep to target
+ */
+ void setWololoTarget(@Nullable Sheep sheep);
+ // Purpur end
}
--
2.24.0