173fa1ee6d
Upstream has released updates that appears to apply and compile correctly Paper Changes: bc17ce69d Delay unsafe actions until after entity ticking is done - Fixes #3114 5553e6b3e Disable Sync Events firing Async errors during shutdown e12c51d9b Use better variable for isStopping() API 586ee2bb1 Remove patch for MC-111480, fixed in 1.14 09a942155 Remove streams from Mob AI System bb5c294ec Fix Disabling Asynchronous Chunks 089d83568 Implement Chunk Priority / Urgency System for World Gen fce69af70 Use dedicated thread for main thread blocking chunk loads 588b62e47 Add tick times API and /mspt command (#3102) 11de41c77 Add API MinecraftServer#isStopping (#3129) 942ff3c28 My patches are under MIT (#3130)
41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
|
|
<tsao-chi@the-lingo.org>
|
|
Date: Fri, 3 Apr 2020 15:18:38 +0800
|
|
Subject: [PATCH] Server Config
|
|
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
|
|
index 93d5a3f97a1b2b3a1cd2731d48e8ebd01d29aa91..08e428bd3aafa1aa9c601da832766906b070190e 100644
|
|
--- a/src/main/java/co/aikar/timings/TimingsExport.java
|
|
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
|
|
@@ -206,7 +206,8 @@ class TimingsExport extends Thread {
|
|
parent.put("config", createObject(
|
|
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
|
|
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
|
|
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
|
|
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
|
|
+ pair("akarin", mapAsJSON(Bukkit.spigot().getAkarinConfig(), null)) // Akarin - Server Config
|
|
));
|
|
|
|
new TimingsExport(listeners, parent, history).start();
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 9ceaac0e859e347b07fa9f4c6507a73deb280670..7444b41592b143fe886e2a3df95442e4bdc5c6f1 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1386,6 +1386,14 @@ public interface Server extends PluginMessageRecipient {
|
|
}
|
|
// Paper end
|
|
|
|
+ // Akarin Start - Server Config
|
|
+ @NotNull
|
|
+ public org.bukkit.configuration.file.YamlConfiguration getAkarinConfig()
|
|
+ {
|
|
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
+ }
|
|
+ // Akarin End - Server Config
|
|
+
|
|
/**
|
|
* Sends the component to the player
|
|
*
|