diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java index 2d9cc2f..b240215 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java @@ -26,15 +26,12 @@ import org.bukkit.OfflinePlayer; import org.bukkit.Registry; import org.bukkit.Sound; -import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.ChestedHorse; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; -import org.bukkit.entity.Llama; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/ChallengeUtils/src/main/java/de/fanta/challengeutils/ItemUtils.java b/ChallengeUtils/src/main/java/de/fanta/challengeutils/ItemUtils.java index 4379537..0902431 100644 --- a/ChallengeUtils/src/main/java/de/fanta/challengeutils/ItemUtils.java +++ b/ChallengeUtils/src/main/java/de/fanta/challengeutils/ItemUtils.java @@ -1,5 +1,6 @@ package de.fanta.challengeutils; +import de.iani.cubesideutils.bukkit.MinecraftVersion; import de.iani.cubesideutils.bukkit.items.ItemBuilder; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextDecoration; @@ -35,10 +36,12 @@ ItemBuilder builder = ItemBuilder.fromItem(stack).displayName(name).lore(lore); if (glowing) { - builder.enchantment(Enchantment.UNBREAKING, 1, true).flag(ItemFlag.HIDE_ENCHANTS); + builder.enchantment(Enchantment.MENDING, 1, true).flag(ItemFlag.HIDE_ENCHANTS); } if (!showTooltip) { - builder.hideTooltip(true); + if (MinecraftVersion.isAboveOrEqual(1, 20, 6)) { + builder.hideTooltip(true); + } } return builder.build(); } diff --git a/Lobby/src/main/java/de/fanta/lobby/Server.java b/Lobby/src/main/java/de/fanta/lobby/Server.java index 49a5674..0beeb40 100644 --- a/Lobby/src/main/java/de/fanta/lobby/Server.java +++ b/Lobby/src/main/java/de/fanta/lobby/Server.java @@ -150,7 +150,7 @@ saveend = new File(plugin.getAdventureMapsPath().toFile(), targetDir + "/world_the_end"); savenether = new File(plugin.getAdventureMapsPath().toFile(), targetDir + "/world_nether"); saveworld = new File(plugin.getAdventureMapsPath().toFile(), targetDir + "/world"); - saveconfigs = new File(plugin.getAdventureMapsPath().toFile(), targetDir + "/" + getPluginFolderPrefix(new File(plugin.getChallengeSavePath().toFile(), targetDir))); + saveconfigs = new File(plugin.getAdventureMapsPath().toFile(), targetDir + "/" + getPluginFolderPrefix(new File(plugin.getAdventureMapsPath().toFile(), targetDir))); } plugin.getComponentUtil().sendNormalMessage(p, "Versuche Map zu laden!"); @@ -171,6 +171,7 @@ } HashMap copyMap = new HashMap<>(); + plugin.getLogger().info("Config From: " + saveconfigs.getAbsolutePath() + " To: " + configs.getAbsolutePath()); copyMap.put(saveServerJar, serverJar); copyMap.put(saveconfigs, configs); copyMap.put(saveworld, world); @@ -306,6 +307,7 @@ } private static String getPluginFolderPrefix(File saveSlot) { + System.out.println(saveSlot.getAbsolutePath()); String challengeFolder = null; File challenges = new File(saveSlot, "/Challenges"); File challenge = new File(saveSlot, "/Challenge");