Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Base 1.13.2

Browse Source
This commit is contained in:
Sotr
2019-03-04 18:38:35 +08:00
parent cadd3f71c0
commit dc3c114449
21 changed files with 1148 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -169,7 +169,7 @@ import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
private final String serverName = "Paper"; // Paper
private final String serverName = org.apache.commons.lang3.StringUtils.isBlank(io.akarin.server.core.AkarinGlobalConfig.serverBrandName) ? "Akarin" : io.akarin.server.core.AkarinGlobalConfig.serverBrandName; // Paper // Akarin - configurable brand name
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");

3
src/main/java/org/bukkit/craftbukkit/Main.java
View File

@@ -21,6 +21,7 @@ public class Main {
public static boolean useConsole = true;
public static void main(String[] args) {
io.akarin.server.core.AkarinGlobalConfig.init(new File("akarin.yml")); // Akarin
// Todo: Installation script
OptionParser parser = new OptionParser() {
{
@@ -219,7 +220,7 @@ public class Main {
if (buildDate.before(deadline.getTime())) {
// 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://papermc.io/downloads ***"); // Paper
System.err.println("*** Please visit our website for the latest information: https://akarin.io/ ***"); // Paper // Akarin
//System.err.println("*** Server will start in 20 seconds ***");
//Thread.sleep(TimeUnit.SECONDS.toMillis(20));
// Paper End

7
src/main/java/org/spigotmc/RestartCommand.java
View File

@@ -42,6 +42,13 @@ public class RestartCommand extends Command
private static void restart(final String restartScript)
{
// Akarin start
if (io.akarin.server.core.AkarinGlobalConfig.noResponseDoGC) {
System.out.println("Attempting to garbage collect, this may takes a few seconds");
System.runFinalization();
System.gc();
}
// Akarin end
AsyncCatcher.enabled = false; // Disable async catcher incase it interferes with us
org.spigotmc.AsyncCatcher.shuttingDown = true; // Paper
try

22
src/main/java/org/spigotmc/WatchdogThread.java
View File

@@ -24,7 +24,7 @@ public class WatchdogThread extends Thread
private WatchdogThread(long timeoutTime, boolean restart)
{
super( "Paper Watchdog Thread" );
super( "Akarin Watchdog Thread" ); // Akarin
this.timeoutTime = timeoutTime;
this.restart = restart;
earlyWarningEvery = Math.min(PaperConfig.watchdogPrintEarlyWarningEvery, timeoutTime); // Paper
@@ -75,12 +75,12 @@ public class WatchdogThread extends Thread
if (isLongTimeout) {
// Paper end
log.log( Level.SEVERE, "------------------------------" );
log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Akarin bug." ); // Paper // Akarin
log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or disk operations are occurring" ); // Akarin - MYSQL -> disk
log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
log.log( Level.SEVERE, "If you are unsure or still think this is a Akarin bug, please report this to https://github.com/Akarin-project/Akarin/issues" ); // Akarin
log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
//
@@ -105,14 +105,14 @@ public class WatchdogThread extends Thread
// Paper end
} else
{
log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---");
log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
log.log(Level.WARNING, "--- DO NOT REPORT THIS TO AKARIN - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Akarin - use WARNING level
log.log(Level.WARNING, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump"); // Akarin - use WARNING level
}
// Paper end - Different message for short timeout
log.log( Level.SEVERE, "------------------------------" );
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
log.log( Level.WARNING, "------------------------------" ); // Akarin - use WARNING level
log.log( Level.WARNING, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Akarin - use WARNING level
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
log.log( Level.SEVERE, "------------------------------" );
log.log( Level.WARNING, "------------------------------" ); // Akarin - use WARNING level
//
// Paper start - Only print full dump on long timeouts
if ( isLongTimeout )
@@ -124,11 +124,11 @@ public class WatchdogThread extends Thread
dumpThread( thread, log );
}
} else {
log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - THIS IS NOT A BUG OR A CRASH ---");
log.log(Level.WARNING, "--- DO NOT REPORT THIS TO AKARIN - THIS IS NOT A BUG OR A CRASH ---"); // Akarin - use WARNING level
}
log.log( Level.SEVERE, "------------------------------" );
log.log( isLongTimeout ? Level.SEVERE : Level.WARNING, "------------------------------" ); // Akarin - use WARNING level
if ( isLongTimeout )
{