Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-22 10:15:54 +01:00
Code Issues Projects Releases Wiki Activity

fix: Replace incorrect player lookups using Bukkit#getPlayer with -Exact

Browse Source 
#34
This commit is contained in:
Christian Koop 2024-03-27 19:27:30 +01:00
parent a1f63b5336
commit 2a2886e9ae
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
23 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/craftaro/skyblock/command/commands/admin/AddUpgradeCommand.java
View File

@ -50,7 +50,7 @@ public class AddUpgradeCommand extends SubCommand {
FileConfiguration configLoad = config.getFileConfiguration(); FileConfiguration configLoad = config.getFileConfiguration();
if (args.length == 2) { if (args.length == 2) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
String targetPlayerName; String targetPlayerName;

10
src/main/java/com/craftaro/skyblock/command/commands/admin/AdminBank.java
View File

@ -78,7 +78,7 @@ public class AdminBank extends SubCommand {
return; return;
case "deposit": case "deposit":
if (args.length >= 3) { if (args.length >= 3) {
islandManager.getIslandByOwner(Bukkit.getOfflinePlayer(Bukkit.getPlayer(args[1]).getUniqueId())).addToBank(Double.parseDouble(args[2])); islandManager.getIslandByOwner(Bukkit.getOfflinePlayer(Bukkit.getPlayerExact(args[1]).getUniqueId())).addToBank(Double.parseDouble(args[2]));
messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.SuccesDeposit.Message").replace("%player%", args[1]).replace("%ammount%", EconomyManager.formatEconomy(Double.parseDouble(args[2])))); messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.SuccesDeposit.Message").replace("%player%", args[1]).replace("%ammount%", EconomyManager.formatEconomy(Double.parseDouble(args[2]))));
} else { } else {
messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message")); messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message"));
@ -86,7 +86,7 @@ public class AdminBank extends SubCommand {
return; return;
case "withdraw": case "withdraw":
if (args.length >= 3) { if (args.length >= 3) {
islandManager.getIslandByOwner(Bukkit.getOfflinePlayer(Bukkit.getPlayer(args[1]).getUniqueId())).removeFromBank(Double.parseDouble(args[2])); islandManager.getIslandByOwner(Bukkit.getOfflinePlayer(Bukkit.getPlayerExact(args[1]).getUniqueId())).removeFromBank(Double.parseDouble(args[2]));
messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.SuccesWithdraw.Message").replace("%player%", args[1]).replace("%ammount%", EconomyManager.formatEconomy(Double.parseDouble(args[2])))); messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.SuccesWithdraw.Message").replace("%player%", args[1]).replace("%ammount%", EconomyManager.formatEconomy(Double.parseDouble(args[2]))));
} else { } else {
messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message")); messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message"));
@ -94,7 +94,7 @@ public class AdminBank extends SubCommand {
return; return;
case "open": case "open":
if (args.length == 2) { if (args.length == 2) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[1]); Player targetPlayer = Bukkit.getPlayerExact(args[1]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
if (targetPlayer == null) { if (targetPlayer == null) {
@ -146,7 +146,7 @@ public class AdminBank extends SubCommand {
return; return;
case "deposit": case "deposit":
if (args.length >= 3) { if (args.length >= 3) {
islandManager.getIslandByOwner(Bukkit.getOfflinePlayer(Bukkit.getPlayer(args[1]).getUniqueId())).addToBank(Double.parseDouble(args[2])); islandManager.getIslandByOwner(Bukkit.getOfflinePlayer(Bukkit.getPlayerExact(args[1]).getUniqueId())).addToBank(Double.parseDouble(args[2]));
messageManager.sendMessage(sender, configLoad.getString("Command.Island.Admin.Bank.SuccesDeposit.Message").replace("%player%", args[1]).replace("%ammount%", EconomyManager.formatEconomy(Double.parseDouble(args[2])))); messageManager.sendMessage(sender, configLoad.getString("Command.Island.Admin.Bank.SuccesDeposit.Message").replace("%player%", args[1]).replace("%ammount%", EconomyManager.formatEconomy(Double.parseDouble(args[2]))));
} else { } else {
messageManager.sendMessage(sender, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message")); messageManager.sendMessage(sender, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message"));
@ -154,7 +154,7 @@ public class AdminBank extends SubCommand {
return; return;
case "withdraw": case "withdraw":
if (args.length >= 3) { if (args.length >= 3) {
islandManager.getIslandByOwner(Bukkit.getOfflinePlayer(Bukkit.getPlayer(args[1]).getUniqueId())).removeFromBank(Double.parseDouble(args[2])); islandManager.getIslandByOwner(Bukkit.getOfflinePlayer(Bukkit.getPlayerExact(args[1]).getUniqueId())).removeFromBank(Double.parseDouble(args[2]));
messageManager.sendMessage(sender, configLoad.getString("Command.Island.Admin.Bank.SuccesWithdraw.Message").replace("%player%", args[1]).replace("%ammount%", EconomyManager.formatEconomy(Double.parseDouble(args[2])))); messageManager.sendMessage(sender, configLoad.getString("Command.Island.Admin.Bank.SuccesWithdraw.Message").replace("%player%", args[1]).replace("%ammount%", EconomyManager.formatEconomy(Double.parseDouble(args[2]))));
} else { } else {
messageManager.sendMessage(sender, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message")); messageManager.sendMessage(sender, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message"));

2
src/main/java/com/craftaro/skyblock/command/commands/admin/DeleteCommand.java
View File

@ -54,7 +54,7 @@ public class DeleteCommand extends SubCommand {
} }
if (args.length == 1) { if (args.length == 1) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID targetPlayerUUID; UUID targetPlayerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/command/commands/admin/OwnerCommand.java
View File

@ -43,7 +43,7 @@ public class OwnerCommand extends SubCommand {
FileConfiguration configLoad = config.getFileConfiguration(); FileConfiguration configLoad = config.getFileConfiguration();
if (args.length == 1) { if (args.length == 1) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID targetPlayerUUID, islandOwnerUUID; UUID targetPlayerUUID, islandOwnerUUID;
String targetPlayerName, islandOwnerName; String targetPlayerName, islandOwnerName;

2
src/main/java/com/craftaro/skyblock/command/commands/admin/RemoveUpgradeCommand.java
View File

@ -49,7 +49,7 @@ public class RemoveUpgradeCommand extends SubCommand {
FileConfiguration configLoad = config.getFileConfiguration(); FileConfiguration configLoad = config.getFileConfiguration();
if (args.length == 2) { if (args.length == 2) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/command/commands/admin/SetAlwaysLoadedCommand.java
View File

@ -51,7 +51,7 @@ public class SetAlwaysLoadedCommand extends SubCommand {
SoundManager soundManager = this.plugin.getSoundManager(); SoundManager soundManager = this.plugin.getSoundManager();
if (args.length == 1) { if (args.length == 1) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
if (targetPlayer == null) { if (targetPlayer == null) {

2
src/main/java/com/craftaro/skyblock/command/commands/admin/SetBiomeCommand.java
View File

@ -76,7 +76,7 @@ public class SetBiomeCommand extends SubCommand {
} }
if (biome != null) { if (biome != null) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/command/commands/admin/SetMaxMembers.java
View File

@ -50,7 +50,7 @@ public class SetMaxMembers extends SubCommand {
if (args.length == 2) { if (args.length == 2) {
if (args[1].matches("[0-9]+")) { if (args[1].matches("[0-9]+")) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/command/commands/admin/SetSizeCommand.java
View File

@ -50,7 +50,7 @@ public class SetSizeCommand extends SubCommand {
if (args.length == 2) { if (args.length == 2) {
if (args[1].matches("[0-9]+")) { if (args[1].matches("[0-9]+")) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/command/commands/island/BanCommand.java
View File

@ -47,7 +47,7 @@ public class BanCommand extends SubCommand {
} else if (this.plugin.getConfiguration().getBoolean("Island.Visitor.Banning")) { } else if (this.plugin.getConfiguration().getBoolean("Island.Visitor.Banning")) {
if (island.hasRole(IslandRole.OWNER, player.getUniqueId()) if (island.hasRole(IslandRole.OWNER, player.getUniqueId())
|| (island.hasRole(IslandRole.OPERATOR, player.getUniqueId()) && permissionManager.hasPermission(island, "Ban", IslandRole.OPERATOR))) { || (island.hasRole(IslandRole.OPERATOR, player.getUniqueId()) && permissionManager.hasPermission(island, "Ban", IslandRole.OPERATOR))) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID targetPlayerUUID; UUID targetPlayerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/command/commands/island/CancelCommand.java
View File

@ -42,7 +42,7 @@ public class CancelCommand extends SubCommand {
} else if (island.hasRole(IslandRole.OWNER, player.getUniqueId()) } else if (island.hasRole(IslandRole.OWNER, player.getUniqueId())
|| island.hasRole(IslandRole.OPERATOR, player.getUniqueId())) { || island.hasRole(IslandRole.OPERATOR, player.getUniqueId())) {
String playerName = args[0]; String playerName = args[0];
Player targetPlayer = Bukkit.getServer().getPlayer(playerName); Player targetPlayer = Bukkit.getPlayerExact(playerName);
if (targetPlayer == null) { if (targetPlayer == null) {
messageManager.sendMessage(player, configLoad.getString("Command.Island.Cancel.Offline.Message")); messageManager.sendMessage(player, configLoad.getString("Command.Island.Cancel.Offline.Message"));

2
src/main/java/com/craftaro/skyblock/command/commands/island/CurrentCommand.java
View File

@ -33,7 +33,7 @@ public class CurrentCommand extends SubCommand {
if (args.length > 0) { if (args.length > 0) {
if (!args[0].equalsIgnoreCase(player.getName())) { if (!args[0].equalsIgnoreCase(player.getName())) {
if (args.length == 1) { if (args.length == 1) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
if (targetPlayer == null) { if (targetPlayer == null) {
messageManager.sendMessage(player, messageManager.sendMessage(player,

2
src/main/java/com/craftaro/skyblock/command/commands/island/DemoteCommand.java
View File

@ -40,7 +40,7 @@ public class DemoteCommand extends SubCommand {
messageManager.sendMessage(player, configLoad.getString("Command.Island.Demote.Owner.Message")); messageManager.sendMessage(player, configLoad.getString("Command.Island.Demote.Owner.Message"));
soundManager.playSound(player, XSound.BLOCK_ANVIL_LAND); soundManager.playSound(player, XSound.BLOCK_ANVIL_LAND);
} else if (island.hasRole(IslandRole.OWNER, player.getUniqueId())) { } else if (island.hasRole(IslandRole.OWNER, player.getUniqueId())) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
if (targetPlayer == null) { if (targetPlayer == null) {
OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]); OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]);

2
src/main/java/com/craftaro/skyblock/command/commands/island/InformationCommand.java
View File

@ -38,7 +38,7 @@ public class InformationCommand extends SubCommand {
UUID islandOwnerUUID = null; UUID islandOwnerUUID = null;
if (args.length == 1) { if (args.length == 1) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
if (targetPlayer == null) { if (targetPlayer == null) {
OfflinePlayer targetOfflinePlayer = new OfflinePlayer(args[0]); OfflinePlayer targetOfflinePlayer = new OfflinePlayer(args[0]);

2
src/main/java/com/craftaro/skyblock/command/commands/island/InviteCommand.java
View File

@ -64,7 +64,7 @@ public class InviteCommand extends SubCommand {
configLoad.getString("Command.Island.Invite.Yourself.Message")); configLoad.getString("Command.Island.Invite.Yourself.Message"));
soundManager.playSound(player, XSound.BLOCK_ANVIL_LAND); soundManager.playSound(player, XSound.BLOCK_ANVIL_LAND);
} else { } else {
Player targetPlayer = Bukkit.getServer().getPlayer(playerName); Player targetPlayer = Bukkit.getPlayerExact(playerName);
if (targetPlayer == null) { if (targetPlayer == null) {
messageManager.sendMessage(player, messageManager.sendMessage(player,

2
src/main/java/com/craftaro/skyblock/command/commands/island/KickCommand.java
View File

@ -59,7 +59,7 @@ public class KickCommand extends SubCommand {
UUID targetPlayerUUID = null; UUID targetPlayerUUID = null;
String targetPlayerName = null; String targetPlayerName = null;
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
Set<UUID> islandMembers = island.getRole(IslandRole.MEMBER), islandOperators = island.getRole(IslandRole.OPERATOR), Set<UUID> islandMembers = island.getRole(IslandRole.MEMBER), islandOperators = island.getRole(IslandRole.OPERATOR),
islandVisitors = islandManager.getVisitorsAtIsland(island); islandVisitors = islandManager.getVisitorsAtIsland(island);

2
src/main/java/com/craftaro/skyblock/command/commands/island/LevelCommand.java
View File

@ -47,7 +47,7 @@ public class LevelCommand extends SubCommand {
FileConfiguration configLoad = config.getFileConfiguration(); FileConfiguration configLoad = config.getFileConfiguration();
if (args.length == 1) { if (args.length == 1) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/command/commands/island/OwnerCommand.java
View File

@ -73,7 +73,7 @@ public class OwnerCommand extends SubCommand {
UUID targetPlayerUUID; UUID targetPlayerUUID;
String targetPlayerName; String targetPlayerName;
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
if (targetPlayer == null) { if (targetPlayer == null) {
OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]); OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]);

2
src/main/java/com/craftaro/skyblock/command/commands/island/PromoteCommand.java
View File

@ -53,7 +53,7 @@ public class PromoteCommand extends SubCommand {
soundManager.playSound(player, XSound.ENTITY_VILLAGER_NO); soundManager.playSound(player, XSound.ENTITY_VILLAGER_NO);
return; return;
} }
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
if (targetPlayer == null) { if (targetPlayer == null) {
OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]); OfflinePlayer offlinePlayer = new OfflinePlayer(args[0]);

2
src/main/java/com/craftaro/skyblock/command/commands/island/UnbanCommand.java
View File

@ -45,7 +45,7 @@ public class UnbanCommand extends SubCommand {
if (island.hasRole(IslandRole.OWNER, player.getUniqueId()) if (island.hasRole(IslandRole.OWNER, player.getUniqueId())
|| (island.hasRole(IslandRole.OPERATOR, player.getUniqueId()) || (island.hasRole(IslandRole.OPERATOR, player.getUniqueId())
&& this.plugin.getPermissionManager().hasPermission(island, "Unban", IslandRole.OPERATOR))) { && this.plugin.getPermissionManager().hasPermission(island, "Unban", IslandRole.OPERATOR))) {
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID targetPlayerUUID; UUID targetPlayerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/command/commands/island/VoteCommand.java
View File

@ -51,7 +51,7 @@ public class VoteCommand extends SubCommand {
return; return;
} }
Player targetPlayer = Bukkit.getServer().getPlayer(args[0]); Player targetPlayer = Bukkit.getPlayerExact(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID;
String targetPlayerName; String targetPlayerName;

2
src/main/java/com/craftaro/skyblock/menus/Members.java
View File

@ -150,7 +150,7 @@ public class Members {
String playerName = ChatColor.stripColor(is.getItemMeta().getDisplayName()); String playerName = ChatColor.stripColor(is.getItemMeta().getDisplayName());
UUID playerUUID; UUID playerUUID;
Player targetPlayer = Bukkit.getServer().getPlayer(playerName); Player targetPlayer = Bukkit.getPlayerExact(playerName);
if (targetPlayer == null) { if (targetPlayer == null) {
playerUUID = new OfflinePlayer(playerName).getUUID(); playerUUID = new OfflinePlayer(playerName).getUUID();

2
src/main/java/com/craftaro/skyblock/menus/Visit.java
View File

@ -135,7 +135,7 @@ public class Visit {
String targetPlayerName = ChatColor.stripColor(is.getItemMeta().getDisplayName()); String targetPlayerName = ChatColor.stripColor(is.getItemMeta().getDisplayName());
UUID targetPlayerUUID; UUID targetPlayerUUID;
Player targetPlayer = Bukkit.getServer().getPlayer(targetPlayerName); Player targetPlayer = Bukkit.getPlayerExact(targetPlayerName);
if (targetPlayer == null) { if (targetPlayer == null) {
targetPlayerUUID = new OfflinePlayer(targetPlayerName).getUniqueId(); targetPlayerUUID = new OfflinePlayer(targetPlayerName).getUniqueId();