From e887a59158bcedbac8c06cd5070c7abf1d4d64bf Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Thu, 12 Jan 2023 10:03:11 +0100 Subject: [PATCH] Officially deprecated BukkitPlayer#BukkitPlayer() (#3922) * Officially deprecated BukkitPlayer#BukkitPlayer() * Address review feedback --- .../plotsquared/bukkit/player/BukkitPlayer.java | 17 ++++++++++++++--- .../bukkit/player/BukkitPlayerManager.java | 2 ++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java index 1bcd3750f..268258ead 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java @@ -67,14 +67,15 @@ public class BukkitPlayer extends PlotPlayer { private String name; /** - *

Please do not use this method. Instead use - * BukkitUtil.getPlayer(Player), as it caches player objects.

- * * @param plotAreaManager PlotAreaManager instance * @param eventDispatcher EventDispatcher instance * @param player Bukkit player instance * @param permissionHandler PermissionHandler instance + * + * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects. + * This method will be made private in a future release. */ + @Deprecated(forRemoval = true, since = "TODO") public BukkitPlayer( final @NonNull PlotAreaManager plotAreaManager, final @NonNull EventDispatcher eventDispatcher, final @NonNull Player player, final @NonNull PermissionHandler permissionHandler @@ -82,6 +83,16 @@ public class BukkitPlayer extends PlotPlayer { this(plotAreaManager, eventDispatcher, player, false, permissionHandler); } + /** + * @param plotAreaManager PlotAreaManager instance + * @param eventDispatcher EventDispatcher instance + * @param player Bukkit player instance + * @param permissionHandler PermissionHandler instance + * + * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects. + * This method will be made private in a future release. + */ + @Deprecated(forRemoval = true, since = "TODO") public BukkitPlayer( final @NonNull PlotAreaManager plotAreaManager, final @NonNull EventDispatcher eventDispatcher, final @NonNull Player player, diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java index 35b550d2f..a1a675598 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java @@ -54,6 +54,7 @@ public class BukkitPlayerManager extends PlayerManager { @NonNull @Override + @SuppressWarnings("deprecation") public BukkitPlayer getPlayer(final @NonNull Player object) { if (object.getUniqueId().version() == 2) { // not a real player return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, object, false, this.permissionHandler); @@ -65,6 +66,7 @@ public class BukkitPlayerManager extends PlayerManager { } @Override + @SuppressWarnings("deprecation") public @NonNull BukkitPlayer createPlayer(final @NonNull UUID uuid) { final Player player = Bukkit.getPlayer(uuid); if (player == null || !player.isOnline()) {