diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java index 499e931..4bcccab 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java @@ -61,39 +61,17 @@ blocklist.put(Material.DEEPSLATE_LAPIS_ORE, 22); for (Player pp : Bukkit.getOnlinePlayers()) { - ItemStack pickaxe = new ItemStack(Material.NETHERITE_PICKAXE, 1); - ItemMeta pickaxeMeta = pickaxe.getItemMeta(); - - pickaxeMeta.addEnchant(Enchantment.DIG_SPEED, 2, true); - pickaxeMeta.setUnbreakable(true); - - pickaxe.setItemMeta(pickaxeMeta); if (!Config.getBoolean("event.teams")) { - for (Player player : Bukkit.getOnlinePlayers()) { - plugin.getScoreManager().join(new ChallengePlayer(player.getUniqueId())); - } - - if (TeamUtils.getPlayerTeam(pp) != null) { - pp.getInventory().addItem(new ItemStack(Material.NETHERITE_SWORD)); - pp.getInventory().addItem(pickaxe); - pp.getInventory().addItem(new ItemStack(Material.COOKED_BEEF, 32)); - } + plugin.getScoreManager().join(new ChallengePlayer(pp.getUniqueId())); } else { for (ChallengeTeam team : TeamUtils.getTeams()) { if (team != null && !TeamUtils.getPlayersInTeam(team).isEmpty()) { plugin.getScoreManager().join(team); } } - - if (pp.getGameMode() == GameMode.SURVIVAL) { - pp.getInventory().addItem(new ItemStack(Material.NETHERITE_SWORD)); - pp.getInventory().addItem(pickaxe); - pp.getInventory().addItem(new ItemStack(Material.COOKED_BEEF, 32)); - } } } - setRunning(true); } else { setRunning(false); @@ -109,7 +87,6 @@ ChatUtil.sendTitleToAll("Event", ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " gewinnt mit " + ChatUtil.BLUE + plugin.getScoreManager().getScore(scorable) + ChatUtil.GREEN + " Punkten", ChatUtil.GREEN); } - } else { for (Scorable scorable : plugin.getScoreManager().getByPositon(1)) { ChallengeTeam team = TeamUtils.getTeam(scorable.getName()); @@ -122,8 +99,6 @@ } } } - - } } }