Archiviert
13
0

Chaos-Patches #1

Zusammengeführt
Lixfel hat 4 Commits von chaos-patches nach master 2020-12-29 15:47:34 +01:00 zusammengeführt
4 geänderte Dateien mit 97 neuen und 1389 gelöschten Zeilen
Nur Änderungen aus Commit 1a9ab897b5 werden angezeigt - Alle Commits anzeigen

Datei-Diff unterdrückt, da er zu groß ist Diff laden

Datei anzeigen

@ -0,0 +1,32 @@
Index: src/main/java/org/bukkit/craftbukkit/Main.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
--- a/src/main/java/org/bukkit/craftbukkit/Main.java (revision 163eed5a26a0c45590314f401c743ddc8adc92de)
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java (revision 12c3f23057841f2868e5fcf4a4a836b73e52b1bb)
@@ -181,23 +181,6 @@
System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
}
Review

Können wir wenn wir das warten rausschmeißen nicht auch die Nachricht davon rausnehmen?

Können wir wenn wir das warten rausschmeißen nicht auch die Nachricht davon rausnehmen?
- if (options.has("noconsole")) {
- useConsole = false;
- }
-
- 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();
- deadline.add(Calendar.DAY_OF_YEAR, -21);
- if (buildDate.before(deadline.getTime())) {
- System.err.println("*** Error, this build is outdated ***");
- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
- System.err.println("*** Server will start in 20 seconds ***");
- Thread.sleep(TimeUnit.SECONDS.toMillis(20));
Review

Bitte wenn einfach nur den Thread.sleep rausnehmen, ansonsten kann das ja alles drin bleiben.

Bitte wenn einfach nur den Thread.sleep rausnehmen, ansonsten kann das ja alles drin bleiben.
- }
- }
-
System.out.println("Loading libraries, please wait...");
MinecraftServer.main(options);
} catch (Throwable t) {

Datei anzeigen

@ -0,0 +1,47 @@
Index: src/main/java/net/minecraft/server/MinecraftServer.java
Review

EULA-Check sollte drinnen bleiben (rechtliche Gründe und kein Performanceproblem)

EULA-Check sollte drinnen bleiben (rechtliche Gründe und kein Performanceproblem)
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
--- a/src/main/java/net/minecraft/server/MinecraftServer.java (revision 80e88864c308ef9c8481a5d5af2ec1bda862fa6d)
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java (revision 74b59be6f63fa4b23e3d93746b36a4a33352a918)
@@ -1162,28 +1162,8 @@
DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
dedicatedserversettings.save();
- java.nio.file.Path java_nio_file_path1 = Paths.get("eula.txt");
- EULA eula = new EULA(java_nio_file_path1);
-
- if (optionset.has("initSettings")) { // CraftBukkit
- MinecraftServer.LOGGER.info("Initialized '" + java_nio_file_path.toAbsolutePath().toString() + "' and '" + java_nio_file_path1.toAbsolutePath().toString() + "'");
- return;
- }
// Spigot Start
- boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );
- if ( eulaAgreed )
- {
- System.err.println( "You have used the Spigot command line EULA agreement flag." );
- System.err.println( "By using this setting you are indicating your agreement to Mojang's EULA (https://account.mojang.com/documents/minecraft_eula)." );
- System.err.println( "If you do not agree to the above EULA please stop your server and remove this flag immediately." );
- }
- // Spigot End
- if (!eula.a() && !eulaAgreed) { // Spigot
- MinecraftServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
- return;
- }
-
CrashReport.h();
DispenserRegistry.init();
DispenserRegistry.c();
@@ -2075,7 +2055,8 @@
}
private void bb() {
- Block.REGISTRY_ID.forEach(IBlockData::c);
+ Thread blockRegistry = new Thread(() -> Block.REGISTRY_ID.forEach(IBlockData::c));
+ blockRegistry.start();
}
// CraftBukkit start

Datei anzeigen

@ -0,0 +1,18 @@
Index: src/main/java/net/minecraft/server/DedicatedServer.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
--- a/src/main/java/net/minecraft/server/DedicatedServer.java (revision 12c3f23057841f2868e5fcf4a4a836b73e52b1bb)
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java (revision 80e88864c308ef9c8481a5d5af2ec1bda862fa6d)
@@ -151,9 +151,6 @@
thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(DedicatedServer.LOGGER));
thread.start();
DedicatedServer.LOGGER.info("Starting minecraft server version " + SharedConstants.getGameVersion().getName());
- if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
- DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
- }
DedicatedServer.LOGGER.info("Loading properties");
DedicatedServerProperties dedicatedserverproperties = this.propertyManager.getProperties();