Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
932e97f3 Rename to AsyncPlayerSendSuggestionsEvent to be consistent in naming
0dd19075 AsyncSendPlayerSuggestionsEvent Brigadier Event
a9e20e5f Fix being kicked in survival for block picking - Fixes #3277
4d20537e Expose game version (#3274)
85fb0015 Validate PickItem Packet and kick for invalid - Fixes #3256
5729bc71 Special case Keep Alive packets from Anti Xray
a76b7740 Improved oversized chunk data packet handling
a6f78170 Use Vanilla Bed Search for non players (Villagers)
68fb98b5 Fix 2 plugin specific issues with loot drop and pathfinders
6e41f7b7 Update Activation Range 2.0 with more villager controls
57dd3971 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-05-02 21:01:38 -05:00
parent be3ee18320
commit 4d42781bdd
19 changed files with 74 additions and 74 deletions

View File

@@ -1,4 +1,4 @@
From 75594bce9db8a7086286dee1fc3c018dd8d9937a Mon Sep 17 00:00:00 2001
From 4692fd99f07ec237c162c84fb54ba85e3662cff5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
@@ -75,10 +75,10 @@ index 2453f0149..b4652a2c2 100644
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 9c380f87d..fd0a49713 100644
index d89a30659..5065a6aa9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1507,6 +1507,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1522,6 +1522,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];