From 0392f45e9cc72327ad865b00fefdec161cfeb920 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Tue, 6 Jul 2021 22:16:50 +1000
Subject: [PATCH] Remove outdated build delay.

By: md_5 <git@md-5.net>
---
 .../net/minecraft/server/players/PlayerList.patch    | 12 +++++++-----
 .../src/main/java/org/bukkit/craftbukkit/Main.java   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch b/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch
index 0eecc5ddbe..bdb577f33b 100644
--- a/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch
+++ b/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch
@@ -702,7 +702,7 @@
      public void sendMessage(IChatBaseComponent ichatbasecomponent, ChatMessageType chatmessagetype, UUID uuid) {
          this.server.sendMessage(ichatbasecomponent, uuid);
          Iterator iterator = this.players.iterator();
-@@ -838,16 +1142,23 @@
+@@ -838,24 +1142,32 @@
  
      }
  
@@ -727,10 +727,12 @@
              if (!file1.exists()) {
 -                File file2 = new File(file, entityhuman.getDisplayName().getString() + ".json");
 +                File file2 = new File(file, displayName + ".json"); // CraftBukkit
++                java.nio.file.Path path = file2.toPath();
  
-                 if (file2.exists() && file2.isFile()) {
+-                if (file2.exists() && file2.isFile()) {
++                if (net.minecraft.FileUtils.a(path) && net.minecraft.FileUtils.b(path) && path.startsWith(file.getPath()) && file2.isFile()) {
                      file2.renameTo(file1);
-@@ -855,7 +1166,7 @@
+                 }
              }
  
              serverstatisticmanager = new ServerStatisticManager(this.server, file1);
@@ -739,7 +741,7 @@
          }
  
          return serverstatisticmanager;
-@@ -863,14 +1174,14 @@
+@@ -863,14 +1175,14 @@
  
      public AdvancementDataPlayer f(EntityPlayer entityplayer) {
          UUID uuid = entityplayer.getUniqueID();
@@ -756,7 +758,7 @@
          }
  
          advancementdataplayer.a(entityplayer);
-@@ -906,13 +1217,20 @@
+@@ -906,13 +1218,20 @@
      }
  
      public void reload() {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
index e14685a8d7..8ade9efa7b 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -181,7 +181,7 @@ public class Main {
                     useConsole = false;
                 }
 
-                if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+                if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
                     Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
 
                     Calendar deadline = Calendar.getInstance();