Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
97f920bf Fix suggest-player-names-when-null-tab-completions - Fixes #3803
166e52b5 [CI-SKIP] [Auto] Rebuild Patches
5a17ba07 Implements #3761 - Add entity liquid API (#3762)
e0cae289 Fix anvils bug - Fixes #3802
4793f774 Move bedrock config under unsupported, add comments to these configs
adf1de58 Allow delegation to vanilla chunk gen
40ace3f7 Allow delegation to vanilla chunk gen
178a6e50 Add PrepareResultEvent (#3776)
57697cd5 Report proxy onlinde mode to bstats as online (#3093)
6579ce05 Fix #3701 - Loottables erasing on viewing
030da7b8 [CI-SKIP] [Auto] Rebuild Patches
d43def79 Incorrect spawn reason for monsters from spawner - Fixes #3708 (#3764)
97b59df9 [Auto] Updated Upstream (CraftBukkit)
0543f051 [CI-SKIP] [Auto] Rebuild Patches
f3cd94c4 Remove streams from classes related to villager gossip (#3748)
b49104db add EntityTargetLivingEntityEvent for new 1.16 mobs (#3782)
4faf9703 Fix /plugins list not alphabetical to players (#3790)
7e03e44e [CI-SKIP] [Auto] Rebuild Patches
8bb00272 Update itemstack legacy name and lore (#3741)
6c87b6a0 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-05 02:45:06 -05:00
parent d337d76150
commit 329fb0f5ce
31 changed files with 203 additions and 370 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 329e2dd1..4f6f0193 100644
index 4e92ce182..40c8de479 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1749,4 +1749,15 @@ public final class Bukkit {
@@ -1765,4 +1765,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 329e2dd1..4f6f0193 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a5262420..e3808a79 100644
index 9d18c3d3b..e21ce51d5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1544,4 +1544,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1558,4 +1558,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
// Paper end