Use local Floodgate instance

Shortens code and fixes an unused warning
This commit is contained in:
Smart123s
2021-10-24 15:32:30 +02:00
committed by games647
parent fcd2aa95f0
commit af0bc34255

View File

@ -71,7 +71,7 @@ public class FloodgateService extends BedrockService<FloodgatePlayer> {
@Override @Override
public boolean isUsernameForbidden(StoredProfile profile) { public boolean isUsernameForbidden(StoredProfile profile) {
String playerPrefix = FloodgateApi.getInstance().getPlayerPrefix(); String playerPrefix = floodgate.getPlayerPrefix();
return profile.getName().startsWith(playerPrefix) && !playerPrefix.isEmpty(); return profile.getName().startsWith(playerPrefix) && !playerPrefix.isEmpty();
} }
@ -103,14 +103,14 @@ public class FloodgateService extends BedrockService<FloodgatePlayer> {
//prefixes are broken with ProtocolLib, so fall back to name checks without prefixes //prefixes are broken with ProtocolLib, so fall back to name checks without prefixes
//this should be removed if #493 gets fixed //this should be removed if #493 gets fixed
if (core.getPlugin().isPluginInstalled("ProtocolLib")) { if (core.getPlugin().isPluginInstalled("ProtocolLib")) {
for (FloodgatePlayer floodgatePlayer : FloodgateApi.getInstance().getPlayers()) { for (FloodgatePlayer floodgatePlayer : floodgate.getPlayers()) {
if (floodgatePlayer.getUsername().equals(prefixedUsername)) { if (floodgatePlayer.getUsername().equals(prefixedUsername)) {
return floodgatePlayer; return floodgatePlayer;
} }
} }
return null; return null;
} }
for (FloodgatePlayer floodgatePlayer : FloodgateApi.getInstance().getPlayers()) { for (FloodgatePlayer floodgatePlayer : floodgate.getPlayers()) {
if (floodgatePlayer.getCorrectUsername().equals(prefixedUsername)) { if (floodgatePlayer.getCorrectUsername().equals(prefixedUsername)) {
return floodgatePlayer; return floodgatePlayer;
} }
@ -120,7 +120,7 @@ public class FloodgateService extends BedrockService<FloodgatePlayer> {
} }
public FloodgatePlayer getBedrockPlayer(UUID uuid) { public FloodgatePlayer getBedrockPlayer(UUID uuid) {
return FloodgateApi.getInstance().getPlayer(uuid); return floodgate.getPlayer(uuid);
} }
public boolean isBedrockPlayer(UUID uuid) { public boolean isBedrockPlayer(UUID uuid) {