From 85911646f3752707bcb36f4342907744e1775dbc Mon Sep 17 00:00:00 2001 From: Bernhard Date: Wed, 11 May 2022 14:11:57 +0200 Subject: [PATCH] Add ability to disable random Mojang uuid API calls (#3586) * feature: ability to disable impromtu Mojang uuid API calls * refactor: update comment for the new setting --- .../main/java/com/plotsquared/bukkit/BukkitPlatform.java | 6 ++++-- .../java/com/plotsquared/core/configuration/Settings.java | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java index cd7dc4c7f..af6faf26f 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java @@ -513,8 +513,10 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl this.backgroundPipeline.registerService(essentialsUUIDService); } - final SquirrelIdUUIDService impromptuMojangService = new SquirrelIdUUIDService(Settings.UUID.IMPROMPTU_LIMIT); - this.impromptuPipeline.registerService(impromptuMojangService); + if (Settings.UUID.IMPROMPTU_SERVICE_MOJANG_API) { + final SquirrelIdUUIDService impromptuMojangService = new SquirrelIdUUIDService(Settings.UUID.IMPROMPTU_LIMIT); + this.impromptuPipeline.registerService(impromptuMojangService); + } final SquirrelIdUUIDService backgroundMojangService = new SquirrelIdUUIDService(Settings.UUID.BACKGROUND_LIMIT); this.backgroundPipeline.registerService(backgroundMojangService); } else { diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java index 817550e64..4f64fbbac 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java @@ -249,6 +249,9 @@ public class Settings extends Config { public static int UUID_CACHE_SIZE = 100000; @Comment("Rate limit (per 10 minutes) for background UUID fetching from the Mojang API") public static int BACKGROUND_LIMIT = 200; + @Comment("Whether the Mojang API service is enabled for impromptu api calls. If false only the Background task will use" + + " http requests to fill the UUID cache (requires restart)") + public static boolean IMPROMPTU_SERVICE_MOJANG_API = true; @Comment("Rate limit (per 10 minutes) for random UUID fetching from the Mojang API") public static int IMPROMPTU_LIMIT = 300; @Comment("Timeout (in milliseconds) for non-blocking UUID requests (mostly commands)") @@ -691,6 +694,7 @@ public class Settings extends Config { @Comment({"If blocks at the edges of queued operations should be set causing updates", " - Slightly slower, but prevents issues such as fences left connected to nothing"}) public static boolean UPDATE_EDGES = true; + } @Comment("Settings related to tab completion")