Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
6ada26a6d [Auto] Updated Upstream (Spigot)
f645e8d08 [Auto] Updated Upstream (Bukkit)
ac69804c7 Updated Upstream (Bukkit/Spigot) (#5048)
b109eef0d [CI-SKIP] [Auto] Rebuild Patches
9110bb8ee Fix villager boat exploit (#5047)
This commit is contained in:
BillyGalbreath
2021-01-12 19:55:19 -06:00
parent 885092f773
commit 8bfb9f5c19
7 changed files with 11 additions and 37 deletions

View File

@@ -37,7 +37,7 @@ index 22e84d2e08ad436c553dc7d99046adf9ee63e9f1..9399b3c1571dfbbc58476e3d92599f58
this.isRestarting = isRestarting;
if (flag) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index f055fd0aff86d04677d0bd256c9e7c12f94bfbcc..d2a7fa1595ed4bc9fea0238af42f70889e07b262 100644
index 2f1a2fa1f80ed23c67db1d01023a04b5074d1654..ebbbd6f86cd08d84c37c8550eda1b805fe966bc3 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -513,6 +513,8 @@ public abstract class PlayerList {