core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (CraftBukkit) 

Upstream has released updates that appear 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:
7a6c3c9a Remove outdated build delay.
This commit is contained in:
Shane Freeder 2021-01-15 16:28:53 +00:00
parent 7232d8f2af
commit eac03694fd
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0001-POM-Changes.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 185aa47591ddf92bece217a56078bd74777f749a..7d38039fcba45ee55f35c0291ad66a58ef99c392 100644
index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e56fe310b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,14 @@
@ -196,13 +196,13 @@ index 185aa47591ddf92bece217a56078bd74777f749a..7d38039fcba45ee55f35c0291ad66a58
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 60ede7442b2d9a63fcd765aff29a96c9130aebac..3f52c19b6b797e26b3dcedcec2afd28c478e7091 100644
index 9a26aa7807271fcaaa3a596d6861a05b6717ead2..2fc61b25c9553480814283ec0858d017c1d8b7e5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -186,7 +186,7 @@ public class Main {
}
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);
+ Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper

6
Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -19,7 +19,7 @@ Other changes:
configuration
diff --git a/pom.xml b/pom.xml
index 7d38039fcba45ee55f35c0291ad66a58ef99c392..7c775cb6b51be98e2a257a5e2774e23f35e46369 100644
index 6490e605b560cda01489983be498868e56fe310b..fa902057491114bd7e919982c0970dd019d9e643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,10 +44,27 @@
@ -286,7 +286,7 @@ index 60d5de863b3abf364e0895d1b83c836b75e1e2be..921434d9adf0b2c55c1194a3f258ffad
@Override
public PluginCommand getPluginCommand(String name) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 78b6d00ea40e8d7c450e08e444c5231e7c99969b..78fad8d06540a0cf41302f12bf25e08e49f589d9 100644
index c4bd353a53bf620644492d2629ab0ab07cb267c2..1c4c72800550806fd3daddc94cd0cb7a23e897e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -12,7 +12,7 @@ import java.util.logging.Level;
@ -325,7 +325,7 @@ index 78b6d00ea40e8d7c450e08e444c5231e7c99969b..78fad8d06540a0cf41302f12bf25e08e
+ System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
}
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
@@ -226,7 +237,7 @@ public class Main {
System.out.println("Unable to read system info");
}

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 7029c0a8f3e2a233c889ef3c558aa0f75c29bc5a
Subproject commit 7a6c3c9aa6e48de164aeeb78052a7775f3f81c30