mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
18c3716c49
This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
From 2a68cb4cbc3ea0c0286a664799ae43b26a3837be Mon Sep 17 00:00:00 2001
|
|
From: DemonWav <demonwav@gmail.com>
|
|
Date: Sun, 6 Aug 2017 17:17:53 -0500
|
|
Subject: [PATCH] Fix this stupid bullshit
|
|
|
|
Disable the 15 second sleep when the server jar hasn't been rebuilt within a period of time.
|
|
|
|
modified in order to prevent merge conflicts when Spigot changes/disables the warning,
|
|
and to provide some level of hint without being disruptive.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index c9e8a8737..ae2c51f5d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -209,10 +209,12 @@ public class Main {
|
|
Calendar deadline = Calendar.getInstance();
|
|
deadline.add(Calendar.DAY_OF_YEAR, -14);
|
|
if (buildDate.before(deadline.getTime())) {
|
|
- System.err.println("*** Error, this build is outdated ***");
|
|
+ // Paper start - This is some stupid bullshit
|
|
+ System.err.println("*** Warning, you've not updated in a while! ***");
|
|
System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper
|
|
- System.err.println("*** Server will start in 15 seconds ***");
|
|
- Thread.sleep(TimeUnit.SECONDS.toMillis(15));
|
|
+ //System.err.println("*** Server will start in 15 seconds ***");
|
|
+ //Thread.sleep(TimeUnit.SECONDS.toMillis(15));
|
|
+ // Paper End
|
|
}
|
|
}
|
|
|
|
--
|
|
2.18.0
|
|
|