From af0bc342555dd4277a2719995b9cf0bb22a57234 Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Sun, 24 Oct 2021 15:32:30 +0200 Subject: [PATCH] Use local Floodgate instance Shortens code and fixes an unused warning --- .../fastlogin/core/hooks/bedrock/FloodgateService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/FloodgateService.java b/core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/FloodgateService.java index a69c896b..b962321a 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/FloodgateService.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/FloodgateService.java @@ -71,7 +71,7 @@ public class FloodgateService extends BedrockService { @Override public boolean isUsernameForbidden(StoredProfile profile) { - String playerPrefix = FloodgateApi.getInstance().getPlayerPrefix(); + String playerPrefix = floodgate.getPlayerPrefix(); return profile.getName().startsWith(playerPrefix) && !playerPrefix.isEmpty(); } @@ -103,14 +103,14 @@ public class FloodgateService extends BedrockService { //prefixes are broken with ProtocolLib, so fall back to name checks without prefixes //this should be removed if #493 gets fixed if (core.getPlugin().isPluginInstalled("ProtocolLib")) { - for (FloodgatePlayer floodgatePlayer : FloodgateApi.getInstance().getPlayers()) { + for (FloodgatePlayer floodgatePlayer : floodgate.getPlayers()) { if (floodgatePlayer.getUsername().equals(prefixedUsername)) { return floodgatePlayer; } } return null; } - for (FloodgatePlayer floodgatePlayer : FloodgateApi.getInstance().getPlayers()) { + for (FloodgatePlayer floodgatePlayer : floodgate.getPlayers()) { if (floodgatePlayer.getCorrectUsername().equals(prefixedUsername)) { return floodgatePlayer; } @@ -120,7 +120,7 @@ public class FloodgateService extends BedrockService { } public FloodgatePlayer getBedrockPlayer(UUID uuid) { - return FloodgateApi.getInstance().getPlayer(uuid); + return floodgate.getPlayer(uuid); } public boolean isBedrockPlayer(UUID uuid) {