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

@@ -79,10 +79,10 @@ index d1d4f4baf33e6b2224116f22a63b6d218e26635b..07fcf1646a46b867ffb0e88746b4a781
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 70f702680f8221cb262023814a7bae21b0074da6..0b453e9d1299cb48df6d3d70048907f628896753 100644
index 4bc9b3b08b42becfd66f39cb0d639bdcae18d45c..d51650b3f7b14d0659cccb4acef969aa7a211200 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -905,6 +905,8 @@ public abstract class PlayerList {
@@ -914,6 +914,8 @@ public abstract class PlayerList {
}
// Paper end