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 3635012280c234231d996c604d2ec76269c67dd7 Mon Sep 17 00:00:00 2001
From 0b90223266a44ecb1cdaa22ec463a24d231cb174 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:18:40 -0500
Subject: [PATCH] Bring back server name
@@ -9,10 +9,10 @@ Subject: [PATCH] Bring back server name
2 files changed, 20 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9cac2d299..cd6c2f7ca 100644
index 5d42cf62..7164ff2c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1692,4 +1692,15 @@ public final class Bukkit {
@@ -1704,4 +1704,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -29,10 +29,10 @@ index 9cac2d299..cd6c2f7ca 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8f16fb0cb..60d85e233 100644
index aabf82b5..5313b152 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1487,4 +1487,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1497,4 +1497,13 @@ public interface Server extends PluginMessageRecipient {
*/
boolean isStopping();
// Paper end