Fix for proxy command while player is offline.

This commit is contained in:
Brianna 2019-09-01 12:46:51 -04:00
parent 99de1ccf5b
commit 18d52f1e33

View File

@ -41,31 +41,24 @@ public class ProxyCommand 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]); OfflinePlayer targetPlayerOffline = new OfflinePlayer(args[0]);
UUID islandOwnerUUID; UUID islandOwnerUUID = targetPlayerOffline.getOwner();
if (targetPlayer == null) {
OfflinePlayer targetPlayerOffline = new OfflinePlayer(args[0]);
islandOwnerUUID = targetPlayerOffline.getOwner();
} else {
islandOwnerUUID = playerDataManager.getPlayerData(targetPlayer).getOwner();
}
if (islandManager.containsIsland(islandOwnerUUID)) { if (islandManager.containsIsland(islandOwnerUUID)) {
if (islandManager.isPlayerProxyingAnotherPlayer(((Player)sender).getUniqueId())) { if (islandManager.isPlayerProxyingAnotherPlayer(((Player)sender).getUniqueId())) {
messageManager.sendMessage(sender, messageManager.sendMessage(sender,
configLoad.getString("Command.Island.Admin.Proxy.IsOffPlayer.Message") configLoad.getString("Command.Island.Admin.Proxy.IsOffPlayer.Message")
.replace("%player", targetPlayer.getName())); .replace("%player", targetPlayerOffline.getName()));
soundManager.playSound(sender, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F); soundManager.playSound(sender, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
islandManager.removeProxyingPlayer(((Player)sender).getUniqueId()); islandManager.removeProxyingPlayer(((Player)sender).getUniqueId());
} else { } else {
messageManager.sendMessage(sender, messageManager.sendMessage(sender,
configLoad.getString("Command.Island.Admin.Proxy.IsOn.Message") configLoad.getString("Command.Island.Admin.Proxy.IsOn.Message")
.replace("%player", targetPlayer.getName())); .replace("%player", targetPlayerOffline.getName()));
soundManager.playSound(sender, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F); soundManager.playSound(sender, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
islandManager.addProxiedPlayer(((Player)sender).getUniqueId(), targetPlayer.getUniqueId()); islandManager.addProxiedPlayer(((Player)sender).getUniqueId(), targetPlayerOffline.getUniqueId());
} }
} }
} else if (args.length == 0){ } else if (args.length == 0){