From 1d201b04baf8d608ccc365326398686d72791218 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Fri, 13 Jan 2023 17:48:13 +0100 Subject: [PATCH] chore: Update a few deprecations (#3913) --- .../src/main/java/com/plotsquared/bukkit/BukkitPlatform.java | 5 ----- .../plotsquared/bukkit/managers/MultiverseWorldManager.java | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java index 4355e9418..8055bd5cb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java @@ -36,7 +36,6 @@ import com.plotsquared.bukkit.listener.ChunkListener; import com.plotsquared.bukkit.listener.EntityEventListener; import com.plotsquared.bukkit.listener.EntitySpawnListener; import com.plotsquared.bukkit.listener.PaperListener; -import com.plotsquared.bukkit.listener.PaperListener113; import com.plotsquared.bukkit.listener.PlayerEventListener; import com.plotsquared.bukkit.listener.ProjectileEventListener; import com.plotsquared.bukkit.listener.ServerListener; @@ -356,11 +355,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl getServer().getPluginManager().registerEvents(injector().getInstance(ServerListener.class), this); getServer().getPluginManager().registerEvents(injector().getInstance(EntitySpawnListener.class), this); if (PaperLib.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) { - if (serverVersion()[1] == 13) { - getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener113.class), this); - } else { getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this); - } } else { getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java index 0a6ed594b..8f4439339 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java @@ -30,8 +30,9 @@ import org.checkerframework.checker.nullness.qual.Nullable; * * @deprecated Deprecated and scheduled for removal without replacement * in favor of the build in setup wizard. + * However, this class will be kept around for a while, given it's not a maintenance burden. */ -@Deprecated(forRemoval = true, since = "6.0.0") +@Deprecated @Singleton public class MultiverseWorldManager extends BukkitWorldManager {