Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a8ef0a93 Drop remove leaked chunk patch - causing many issues
ff4ca31f Fix premature unloading of neighbor chunks for world gen
fde81356 Fix Chunks unloading immediately for priority access - Fixes #3461
9980f427 Fix some logic on villager poi max attempts
919ab67a Fix concurrency issue in light engine (Vanilla bug)
0d5ec653 Cleanup async chunks (#3456)
c3c005c9 Updated Upstream (Bukkit/CraftBukkit) (Fixes #3443)
This commit is contained in:
William Blake Galbreath
2020-05-29 17:42:32 -05:00
parent a2b3b33061
commit a032d548bf
5 changed files with 17 additions and 17 deletions

View File

@@ -1,4 +1,4 @@
From c7218d4100f7de38fbfc643e4705908adf1c41bd Mon Sep 17 00:00:00 2001
From da8df9256caea27c4fc9e9298878e1d1428fe6a1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 15 Mar 2020 20:52:12 -0500
Subject: [PATCH] Add ItemStack convenience methods
@@ -9,10 +9,10 @@ Subject: [PATCH] Add ItemStack convenience methods
2 files changed, 651 insertions(+)
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 1f2dbd68c..f2be0d0ce 100644
index b89fc2dc0..d5cf01dae 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -7995,4 +7995,36 @@ public enum Material implements Keyed {
@@ -8021,4 +8021,36 @@ public enum Material implements Keyed {
// </editor-fold>
}
}