From 928e5f05b00b435d8bebfcd6d25c376993a8b0d2 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sun, 20 Dec 2020 05:03:11 -0500 Subject: [PATCH] Oopsieskinfix (#6) Fix wrong method being called for showing player Co-authored-by: Tim203 --- .../geysermc/floodgate/pluginmessage/SpigotSkinApplier.java | 1 + .../floodgate/util/SpigotVersionSpecificMethods.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java b/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java index adf8ab39..88de6014 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java +++ b/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java @@ -86,6 +86,7 @@ public final class SpigotSkinApplier implements SkinApplier { properties.put("textures", property); if (configHolder.get().isApplySkinDirectly()) { + // By running as a task, we don't run into async issues plugin.getServer().getScheduler().runTask(plugin, () -> { for (Player p : Bukkit.getOnlinePlayers()) { if (p != player && p.canSee(player)) { diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java index 389e1086..7b56e627 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java @@ -54,6 +54,7 @@ public final class SpigotVersionSpecificMethods { return player.spigot().getLocale(); } + @SuppressWarnings("deprecation") public void hidePlayer(Player hideFor, Player playerToHide) { if (NEW_VISIBILITY) { hideFor.hidePlayer(plugin, playerToHide); @@ -62,11 +63,12 @@ public final class SpigotVersionSpecificMethods { hideFor.hidePlayer(playerToHide); } + @SuppressWarnings("deprecation") public void showPlayer(Player showFor, Player playerToShow) { if (NEW_VISIBILITY) { - showFor.hidePlayer(plugin, playerToShow); + showFor.showPlayer(plugin, playerToShow); return; } - showFor.hidePlayer(playerToShow); + showFor.showPlayer(playerToShow); } }