Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-06-28 23:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Fix for challenges with per-island true

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-07-09 18:56:31 +02:00
parent 2812c6d07d
commit 2a0dc9396f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/songoda/skyblock/challenge/player/PlayerManager.java
View File

@ -9,6 +9,7 @@ import com.songoda.skyblock.config.FileManager.Config;
import com.songoda.skyblock.island.Island;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
@ -41,8 +42,12 @@ public class PlayerManager {
public HashMap<Challenge, Integer> getPlayer(UUID uuid) {
if (plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml")).getFileConfiguration()
.getBoolean("Island.Challenge.PerIsland", true)) {
Island is = plugin.getIslandManager().getIsland(Bukkit.getOfflinePlayer(uuid));
.getBoolean("Island.Challenge.PerIsland", false)) {
OfflinePlayer player = Bukkit.getPlayer(uuid);
if(player == null) {
player = Bukkit.getOfflinePlayer(uuid);
}
Island is = plugin.getIslandManager().getIsland(player);
if(is != null){
uuid = is.getOwnerUUID();
}
@ -99,10 +104,18 @@ public class PlayerManager {
*/
public void unloadPlayer(UUID uuid) {
if (plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml")).getFileConfiguration()
.getBoolean("Island.Challenge.PerIsland", true)) {
Island is = plugin.getIslandManager().getIsland(Bukkit.getOfflinePlayer(uuid));
.getBoolean("Island.Challenge.PerIsland", false)) {
OfflinePlayer player = Bukkit.getPlayer(uuid);
if(player == null) {
player = Bukkit.getOfflinePlayer(uuid);
}
Island is = plugin.getIslandManager().getIsland(player);
if(is != null){
uuid = is.getOwnerUUID();
if (!plugin.getIslandManager().getMembersOnline(is).isEmpty()) {
return;
} else {
uuid = is.getOwnerUUID();
}
}
}
islands.remove(uuid);