diff options
| author | Shane Freeder <[email protected]> | 2023-03-31 05:47:59 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2023-03-31 05:47:59 +0100 |
| commit | 11ab383e4fb546c8e35b634daa51cfda520b5e70 (patch) | |
| tree | ede4ff899c5cc122473da926d4f6b3058ac84dcb /patches | |
| parent | 06fdc02537c39f2c69a3e7edbd5172bc83e17b6f (diff) | |
| download | Paper-11ab383e4fb546c8e35b634daa51cfda520b5e70.tar.gz Paper-11ab383e4fb546c8e35b634daa51cfda520b5e70.zip | |
Don't use plugin-profiling to enable timings
The paper config has taken precidence over this for a long time
with 0 complaints, and now it's tripping the deprecation warning,
even if timings is disabled in the paper config.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/server/0014-Timings-v2.patch | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch index eef4bb4f2e..70c7d239fe 100644 --- a/patches/server/0014-Timings-v2.patch +++ b/patches/server/0014-Timings-v2.patch @@ -1632,9 +1632,18 @@ index 9c3ce492051199acb8d38ade121ec8a0cbc50f54..aa4f2dc63dd79e6c3d7594d2fd63fa00 }; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 63e1ad046051ef60df339e3b9c14f73db0e0de21..36c1fd2987843d74b6f8f5711e77d67565f25c5b 100644 +index 63e1ad046051ef60df339e3b9c14f73db0e0de21..394d8631cb0a143cc7b5d71c919a8298652d5678 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -361,7 +361,7 @@ public final class CraftServer implements Server { + this.saveCommandsConfig(); + this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); + this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); +- this.pluginManager.useTimings(this.configuration.getBoolean("settings.plugin-profiling")); ++ //this.pluginManager.useTimings(this.configuration.getBoolean("settings.plugin-profiling")); // Paper - we already moved this + this.overrideSpawnLimits(); + console.autosavePeriod = this.configuration.getInt("ticks-per.autosave"); + this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose")); @@ -2391,12 +2391,31 @@ public final class CraftServer implements Server { private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot() { |