Code optimizations

This commit is contained in:
Fabrizio La Rosa 2020-07-08 10:33:50 +02:00
parent da02fd6d95
commit f6679f79b2
3 changed files with 14 additions and 14 deletions

View File

@ -47,8 +47,8 @@ public class BanCommand extends SubCommand {
|| (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.getServer().getPlayer(args[0]);
UUID targetPlayerUUID = null; UUID targetPlayerUUID;
String targetPlayerName = null; String targetPlayerName;
if (targetPlayer == null) { if (targetPlayer == null) {
OfflinePlayer targetPlayerOffline = new OfflinePlayer(args[0]); OfflinePlayer targetPlayerOffline = new OfflinePlayer(args[0]);

View File

@ -8,10 +8,8 @@ import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.island.IslandRole; import com.songoda.skyblock.island.IslandRole;
import com.songoda.skyblock.island.IslandStatus; import com.songoda.skyblock.island.IslandStatus;
import com.songoda.skyblock.message.MessageManager; import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.songoda.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.songoda.skyblock.utils.player.OfflinePlayer;
import org.bukkit.Bukkit;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -11,16 +11,16 @@ import java.util.UUID;
public class OfflinePlayer { public class OfflinePlayer {
private UUID uuid; private final UUID uuid;
org.bukkit.OfflinePlayer bukkitOfflinePlayer; org.bukkit.OfflinePlayer bukkitOfflinePlayer;
private String name; private String name;
private String memberSince; private final String memberSince;
private String lastOnline; private final String lastOnline;
private UUID owner = null; private UUID owner = null;
private String[] texture; private final String[] texture;
private int playtime; private final int playtime;
public OfflinePlayer(String name) { public OfflinePlayer(String name) {
SkyBlock skyblock = SkyBlock.getInstance(); SkyBlock skyblock = SkyBlock.getInstance();
@ -28,13 +28,15 @@ public class OfflinePlayer {
bukkitOfflinePlayer = Bukkit.getServer().getOfflinePlayer(name); bukkitOfflinePlayer = Bukkit.getServer().getOfflinePlayer(name);
this.name = bukkitOfflinePlayer.getName(); if (userCacheManager.hasUser(name)) {
this.uuid = bukkitOfflinePlayer.getUniqueId();
if (this.uuid == null && userCacheManager.hasUser(name)) {
this.uuid = userCacheManager.getUser(name); this.uuid = userCacheManager.getUser(name);
bukkitOfflinePlayer = Bukkit.getServer().getOfflinePlayer(uuid);
} else {
this.uuid = bukkitOfflinePlayer.getUniqueId();
} }
this.name = bukkitOfflinePlayer.getName();
FileConfiguration configLoad = YamlConfiguration.loadConfiguration( FileConfiguration configLoad = YamlConfiguration.loadConfiguration(
new File(new File(skyblock.getDataFolder().toString() + "/player-data"), uuid.toString() + ".yml")); new File(new File(skyblock.getDataFolder().toString() + "/player-data"), uuid.toString() + ".yml"));
texture = new String[]{configLoad.getString("Texture.Signature"), configLoad.getString("Texture.Value")}; texture = new String[]{configLoad.getString("Texture.Signature"), configLoad.getString("Texture.Value")};