mirror of
https://github.com/songoda/FabledSkyBlock.git
synced 2024-09-29 23:17:26 +02:00
Fix for challenges with per-island true
This commit is contained in:
parent
2812c6d07d
commit
2a0dc9396f
@ -9,6 +9,7 @@ import com.songoda.skyblock.config.FileManager.Config;
|
|||||||
import com.songoda.skyblock.island.Island;
|
import com.songoda.skyblock.island.Island;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.OfflinePlayer;
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
import org.bukkit.configuration.ConfigurationSection;
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -41,8 +42,12 @@ public class PlayerManager {
|
|||||||
|
|
||||||
public HashMap<Challenge, Integer> getPlayer(UUID uuid) {
|
public HashMap<Challenge, Integer> getPlayer(UUID uuid) {
|
||||||
if (plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml")).getFileConfiguration()
|
if (plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml")).getFileConfiguration()
|
||||||
.getBoolean("Island.Challenge.PerIsland", true)) {
|
.getBoolean("Island.Challenge.PerIsland", false)) {
|
||||||
Island is = plugin.getIslandManager().getIsland(Bukkit.getOfflinePlayer(uuid));
|
OfflinePlayer player = Bukkit.getPlayer(uuid);
|
||||||
|
if(player == null) {
|
||||||
|
player = Bukkit.getOfflinePlayer(uuid);
|
||||||
|
}
|
||||||
|
Island is = plugin.getIslandManager().getIsland(player);
|
||||||
if(is != null){
|
if(is != null){
|
||||||
uuid = is.getOwnerUUID();
|
uuid = is.getOwnerUUID();
|
||||||
}
|
}
|
||||||
@ -99,10 +104,18 @@ public class PlayerManager {
|
|||||||
*/
|
*/
|
||||||
public void unloadPlayer(UUID uuid) {
|
public void unloadPlayer(UUID uuid) {
|
||||||
if (plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml")).getFileConfiguration()
|
if (plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml")).getFileConfiguration()
|
||||||
.getBoolean("Island.Challenge.PerIsland", true)) {
|
.getBoolean("Island.Challenge.PerIsland", false)) {
|
||||||
Island is = plugin.getIslandManager().getIsland(Bukkit.getOfflinePlayer(uuid));
|
OfflinePlayer player = Bukkit.getPlayer(uuid);
|
||||||
|
if(player == null) {
|
||||||
|
player = Bukkit.getOfflinePlayer(uuid);
|
||||||
|
}
|
||||||
|
Island is = plugin.getIslandManager().getIsland(player);
|
||||||
if(is != null){
|
if(is != null){
|
||||||
uuid = is.getOwnerUUID();
|
if (!plugin.getIslandManager().getMembersOnline(is).isEmpty()) {
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
uuid = is.getOwnerUUID();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
islands.remove(uuid);
|
islands.remove(uuid);
|
||||||
|
Loading…
Reference in New Issue
Block a user