[Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
7c395d42 SPIGOT-4681: Note about additional world creation on STARTUP
This commit is contained in:
Aikar
2019-04-08 06:51:36 -04:00
parent 2cb75d6cce
commit 84386e1631
18 changed files with 104 additions and 104 deletions

View File

@@ -1,4 +1,4 @@
From 48590dd6c44d630eb5b4830660f2ae85784abab6 Mon Sep 17 00:00:00 2001
From b18a6e1b22b0928f9d1a2788e5424a406f245a92 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 22:11:48 -0500
Subject: [PATCH] Basic PlayerProfile API
@@ -486,7 +486,7 @@ index 9bf2521be..059665836 100644
private UserCacheEntry(GameProfile gameprofile, Date date) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6dad8fab2..ec17eaf9d 100644
index e8991ce1c..1e8c4a85c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -164,6 +164,10 @@ import org.bukkit.event.server.ServerLoadEvent;
@@ -500,7 +500,7 @@ index 6dad8fab2..ec17eaf9d 100644
public final class CraftServer implements Server {
private final String serverName = "Paper"; // Paper
private final String serverVersion;
@@ -2156,5 +2160,21 @@ public final class CraftServer implements Server {
@@ -2157,5 +2161,21 @@ public final class CraftServer implements Server {
public boolean suggestPlayerNamesWhenNullTabCompletions() {
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
}