Archiviert
12
0

Merge pull request 'Chaos-Patches' (#1) from chaos-patches into master

Dieser Commit ist enthalten in:
Lixfel 2020-12-29 15:47:33 +01:00
Commit a8e0d46b59
2 geänderte Dateien mit 34 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -0,0 +1,16 @@
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 4461c18816eaad0e773b5c71bf2cf301819f80aa)
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java (revision dc1653b7c4cd3b6d8b2583896ec33ee430908002)
@@ -194,7 +194,6 @@
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));
}
}

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();