diff --git a/src/main/java/de/fanta/challenges/challenges/ForceItemChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ForceItemChallengeEvent.java index 13f9d3a..bb7f003 100644 --- a/src/main/java/de/fanta/challenges/challenges/ForceItemChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ForceItemChallengeEvent.java @@ -44,7 +44,6 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerSwapHandItemsEvent; -import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; @@ -95,18 +94,7 @@ public void onActivation(TimerChangedEvent event) { if (Objects.equals(plugin.getConfig().getString("event.type"), "forceitem")) { if (event.isRunning()) { - ItemStack stack = new ItemStack(Material.STRUCTURE_VOID, 3); - ItemMeta meta = stack.getItemMeta(); - List lorelist = new ArrayList<>(); - meta.setDisplayName(ChatUtil.GREEN + "Skip Item"); - meta.getPersistentDataContainer().set(skipKey, PersistentDataType.STRING, "SkipItem"); - lorelist.add(ChatUtil.GREEN + "Rechtsklick um das Aktuelle Item zu Skippen."); - lorelist.add(ChatUtil.GREEN + "Geskippte Items bekommst du 1x ins Inventar."); - meta.setLore(lorelist); - stack.setItemMeta(meta); - - skipItem = stack; - + skipItem = createSkipItem(); for (Material material : Material.values()) { if (material.isItem() && !material.isAir() && !plugin.getNotAvailableMaterials().contains(material)) { @@ -118,8 +106,7 @@ for (Player pp : plugin.getVanish().getPlayerListWithoutVanishPlayers()) { plugin.getScoreManager().join(new ChallengePlayer(pp)); - mountArmorStand(pp); - updateItem(pp); + addArmorStand(pp); pp.getInventory().setItem(8, skipItem); } @@ -501,7 +488,6 @@ ChatUtil.sendNormalMessage(player, "Item: " + ChatUtil.BLUE + new ItemStack(pickupItem).getI18NDisplayName() + ChatUtil.GREEN + " wurde Registriert"); player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1.0F, 1.0F); updateItem(player); - } } @@ -563,4 +549,18 @@ }, 1L); } + + public ItemStack createSkipItem() { + ItemStack stack = new ItemStack(Material.STRUCTURE_VOID, 3); + ItemMeta meta = stack.getItemMeta(); + List lorelist = new ArrayList<>(); + meta.setDisplayName(ChatUtil.GREEN + "Skip Item"); + meta.getPersistentDataContainer().set(skipKey, PersistentDataType.STRING, "SkipItem"); + lorelist.add(ChatUtil.GREEN + "Rechtsklick um das Aktuelle Item zu Skippen."); + lorelist.add(ChatUtil.GREEN + "Geskippte Items bekommst du 1x ins Inventar."); + meta.setLore(lorelist); + stack.setItemMeta(meta); + + return stack; + } }