diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index 83965ae..96e15bd 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -139,15 +139,8 @@ statistics = new Statistics(this); } - try { - Class.forName("io.papermc.paper.threadedregions.scheduler.ScheduledTask"); - getLogger().log(Level.INFO, "Folia found. Use Folia Scheduler"); - scheduler = new FoliaScheduler(this); - isFolia = true; - } catch (Throwable ignored) { - getLogger().log(Level.INFO, "Bukkit found. Use Bukkit Scheduler"); - scheduler = new BukkitScheduler(this); - } + getLogger().log(Level.INFO, "Bukkit found. Use Bukkit Scheduler"); + scheduler = new BukkitScheduler(this); protocolVersion = Bukkit.getUnsafe().getProtocolVersion(); diff --git a/src/main/java/de/fanta/challenges/Timer.java b/src/main/java/de/fanta/challenges/Timer.java index 2e0b970..27f552e 100644 --- a/src/main/java/de/fanta/challenges/Timer.java +++ b/src/main/java/de/fanta/challenges/Timer.java @@ -48,7 +48,7 @@ } else { for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); - p.sendTitle(ChatUtil.RED + "ZEIT ABGELAUFEN!", ChatUtil.RED + "Challenge fehgeschlagen", 10, 60, 10); + p.sendTitle(ChatUtil.RED + "ZEIT ABGELAUFEN!", ChatUtil.RED + "Challenge fehlgeschlagen", 10, 60, 10); } ChatUtil.sendBrodcastMessage(ChatUtil.RED + "Die Zeit ist abgelaufen und die Challenge somit fehlgeschlagen!"); ChatUtil.sendBrodcastMessage("Seed: " + ChatUtil.BLUE + Bukkit.getWorlds().get(0).getSeed()); @@ -121,15 +121,11 @@ } public String formatTime(ChatColor color) { - String formattime = StringUtil.formatTimespan((time / 1000) * 1000, " Tage, ", ":", "", "", "", ":", false, true); - if (formattime.startsWith("1 Tage")) { - return color + StringUtil.formatTimespan((time / 1000) * 1000, " Tag, ", ":", "", "", "", ":", false, true); - } - return color + formattime; + return color + formatTime(); } public String formatTime() { - String formattime = StringUtil.formatTimespan((time / 1000) * 1000, "1 Tage, ", ":", "", "", "", ":", false, true); + String formattime = StringUtil.formatTimespan((time / 1000) * 1000, " Tage, ", ":", "", "", "", ":", false, true); if (formattime.startsWith("1 Tage")) { return StringUtil.formatTimespan((time / 1000) * 1000, " Tag, ", ":", "", "", "", ":", false, true); } @@ -168,6 +164,19 @@ this.countingSinceTimestamp = System.currentTimeMillis(); } + public void addTime(int seconds) { + this.time = Math.max(time + (seconds * 1000L), 0); + this.countingSinceTimestamp = System.currentTimeMillis(); + Config.setValue("editsettings", true); + + } + + public void removeTime(int seconds) { + this.time = Math.max(time - (seconds * 1000L), 0); + this.countingSinceTimestamp = System.currentTimeMillis(); + Config.setValue("editsettings", true); + } + private enum TimerMode { UP, DOWN diff --git a/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java b/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java index 84f794b..6e36c32 100644 --- a/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java @@ -5,6 +5,7 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.CubesideModUtils; +import de.iani.cubesideutils.StringUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; @@ -79,7 +80,7 @@ } } - bossBar.setTitle(ChatUtil.GREEN + "Item » " + ChatUtil.BLUE + item.toString().replace("_", " ") + ChatUtil.BLUE + " (" + ChatUtil.GREEN + foundItems.size() + "/" + itemcount + ChatUtil.BLUE + ")"); + bossBar.setTitle(ChatUtil.GREEN + "Item » " + ChatUtil.BLUE + StringUtil.capitalizeFirstLetter(item.toString(), true) + ChatUtil.BLUE + " (" + ChatUtil.GREEN + foundItems.size() + "/" + itemcount + ChatUtil.BLUE + ")"); double progress = foundItems.size() * 100.0 / itemcount / 100.0; bossBar.setProgress(progress); } else { @@ -107,11 +108,11 @@ item = itemsToSearch.get(r.nextInt((itemsToSearch.size() - 1) + 1)); Config.setValue("allitemscurrentitem", new ItemStack(item)); if (skipped) { - ChatUtil.sendBrodcastMessage("Item: " + ChatUtil.BLUE + old.toString().replace("_", " ") + ChatUtil.GREEN + " wurde von " + p.getName() + " übersprungen."); + ChatUtil.sendBrodcastMessage("Item: " + ChatUtil.BLUE + StringUtil.capitalizeFirstLetter(old.toString(), true) + ChatUtil.GREEN + " wurde von " + p.getName() + " übersprungen."); } else { - ChatUtil.sendBrodcastMessage("Item: " + ChatUtil.BLUE + old.toString().replace("_", " ") + ChatUtil.GREEN + " wurde von " + p.getName() + " Registriert."); + ChatUtil.sendBrodcastMessage("Item: " + ChatUtil.BLUE + StringUtil.capitalizeFirstLetter(old.toString(), true) + ChatUtil.GREEN + " wurde von " + p.getName() + " Registriert."); } - ChatUtil.sendBrodcastMessage("Neues Item: " + ChatUtil.BLUE + item.toString().replace("_", " ") + ChatUtil.GREEN + " (Es fehlen noch " + ChatUtil.BLUE + (foundItems.size()) + ChatUtil.GREEN + " Items)"); + ChatUtil.sendBrodcastMessage("Neues Item: " + ChatUtil.BLUE + StringUtil.capitalizeFirstLetter(item.toString(), true) + ChatUtil.GREEN + " (Es fehlen noch " + ChatUtil.BLUE + (itemcount - foundItems.size()) + ChatUtil.GREEN + " Items)"); for (Player pp : Bukkit.getOnlinePlayers()) { pp.playSound(pp.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1, 1); CubesideModUtils.sendFlashScreenToCubesideMod(plugin, pp, 50, ChatUtil.GREEN); 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 14761ed..74b6c1f 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java @@ -43,22 +43,22 @@ public void onActivation(TimerChangedEvent event) { if (Objects.equals(Config.getString("event.type"), "orebattle")) { if (event.isRunning()) { - blocklist.put(Material.EMERALD_ORE, 61); - blocklist.put(Material.DEEPSLATE_EMERALD_ORE, 2295); - blocklist.put(Material.DIAMOND_ORE, 358); - blocklist.put(Material.DEEPSLATE_DIAMOND_ORE, 12); - blocklist.put(Material.GOLD_ORE, 3); - blocklist.put(Material.DEEPSLATE_GOLD_ORE, 8); - blocklist.put(Material.IRON_ORE, 3); - blocklist.put(Material.DEEPSLATE_IRON_ORE, 7); - blocklist.put(Material.COPPER_ORE, 1); - blocklist.put(Material.DEEPSLATE_COPPER_ORE, 11); - blocklist.put(Material.REDSTONE_ORE, 66); - blocklist.put(Material.DEEPSLATE_REDSTONE_ORE, 5); - blocklist.put(Material.COAL_ORE, 2); - blocklist.put(Material.DEEPSLATE_COAL_ORE, 197); - blocklist.put(Material.LAPIS_ORE, 17); - blocklist.put(Material.DEEPSLATE_LAPIS_ORE, 12); + blocklist.put(Material.EMERALD_ORE, 80); + blocklist.put(Material.DEEPSLATE_EMERALD_ORE, 1500); + blocklist.put(Material.DIAMOND_ORE, 300); + blocklist.put(Material.DEEPSLATE_DIAMOND_ORE, 80); + blocklist.put(Material.GOLD_ORE, 60); + blocklist.put(Material.DEEPSLATE_GOLD_ORE, 60); + blocklist.put(Material.IRON_ORE, 12); + blocklist.put(Material.DEEPSLATE_IRON_ORE, 30); + blocklist.put(Material.COPPER_ORE, 7); + blocklist.put(Material.DEEPSLATE_COPPER_ORE, 45); + blocklist.put(Material.REDSTONE_ORE, 70); + blocklist.put(Material.DEEPSLATE_REDSTONE_ORE, 20); + blocklist.put(Material.COAL_ORE, 7); + blocklist.put(Material.DEEPSLATE_COAL_ORE, 300); + blocklist.put(Material.LAPIS_ORE, 70); + blocklist.put(Material.DEEPSLATE_LAPIS_ORE, 70); for (Player pp : Bukkit.getOnlinePlayers()) { if (!Config.getBoolean("event.teams")) { diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java index 69dd6a7..48f0fce 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java @@ -1,19 +1,15 @@ package de.fanta.challenges.commands.challenges; -import com.comphenix.protocol.PacketType; -import com.comphenix.protocol.ProtocolLibrary; -import com.comphenix.protocol.events.PacketContainer; import de.fanta.challenges.Challenges; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; -import org.bukkit.Sound; +import org.bukkit.Color; +import org.bukkit.Location; +import org.bukkit.Particle; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.util.Vector; - -import java.util.ArrayList; public class ChallengesCommand extends SubCommand { @@ -25,27 +21,9 @@ @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { - ChatUtil.sendNormalMessage(sender, "Challenges v" + plugin.getPluginMeta().getVersion() + " by " + (plugin.getPluginMeta().getAuthors() + "").replace("[" , "").replace("]", "")); + ChatUtil.sendNormalMessage(sender, "Challenges v" + plugin.getPluginMeta().getVersion() + " by " + (plugin.getPluginMeta().getAuthors() + "").replace("[", "").replace("]", "")); ChatUtil.sendNormalMessage(sender, "Nutze /challenges help für Hilfe"); - - if (sender instanceof Player player) { - PacketContainer packet = ProtocolLibrary.getProtocolManager().createPacket(PacketType.Play.Server.NAMED_SOUND_EFFECT); - - // Setze den Sound-Effekt - packet.getSoundEffects().write(0, Sound.BLOCK_NOTE_BLOCK_PLING); - - // Setze die Koordinaten des Sounds - packet.getIntegers().write(0, player.getLocation().getBlockX() * 8); - packet.getIntegers().write(1, player.getLocation().getBlockY() * 8); - packet.getIntegers().write(2, player.getLocation().getBlockZ() * 8); - - // Setze die Lautstärke und Tonhöhe des Sounds - packet.getFloat().write(0, 1.0f); // Lautstärke - packet.getFloat().write(1, 1.0f); // Tonhöhe - - ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet); - } - return true; } + } diff --git a/src/main/java/de/fanta/challenges/guis/TimerGui.java b/src/main/java/de/fanta/challenges/guis/TimerGui.java index cb37bb0..d21d441 100644 --- a/src/main/java/de/fanta/challenges/guis/TimerGui.java +++ b/src/main/java/de/fanta/challenges/guis/TimerGui.java @@ -2,14 +2,15 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.ServerType; +import de.fanta.challenges.Timer; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.Config; import de.fanta.challenges.utils.guiutils.AbstractWindow; import de.fanta.challenges.utils.guiutils.GUIUtils; +import de.iani.cubesideutils.bukkit.items.CustomHeads; +import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; -import org.bukkit.GameRule; import org.bukkit.Material; -import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; @@ -20,9 +21,17 @@ public static final int INVENTORY_SIZE = 27; - private static final int DIRECTION_INDEX = 11; - private static final int SHOWTIMER_INDEX = 13; - private static final int START_INDEX = 15; + private static final int TIMER_TOGGLE_INDEX = 0; + private static final int CLOSE_INDEX = 8; + + private static final int TIME_DAYS_INDEX = 10; + private static final int TIME_HOURS_INDEX = 11; + private static final int TIME_MINUTES_INDEX = 12; + private static final int TIME_SECONDS_INDEX = 13; + + + private static final int DIRECTION_INDEX = 15; + private static final int SHOW_TIMER_INDEX = 16; public TimerGui(Player player) { super(player, Bukkit.createInventory(player, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Timer")); @@ -61,7 +70,7 @@ rebuildInventory(); } } - case SHOWTIMER_INDEX -> { + case SHOW_TIMER_INDEX -> { if (Config.getBoolean("showtimer")) { Config.setValue("showtimer", false, false); ChatUtil.sendTitleToAll("Timer", "Der Timer wird jetzt nicht mehr angezeigt!", ChatUtil.RED); @@ -71,7 +80,7 @@ } rebuildInventory(); } - case START_INDEX -> { + case TIMER_TOGGLE_INDEX -> { if (plugin.getTimer().isRunning()) { plugin.getTimer().stopTimer(); plugin.setDayLightCircle(false); @@ -97,9 +106,60 @@ } player.closeInventory(); } + case TIME_DAYS_INDEX -> { + Timer timer = plugin.getTimer(); + if (event.isLeftClick()) { + timer.addTime(!event.isShiftClick() ? 60 * 60 * 24 : 60 * 60 * 24 * 10); + } + + if (event.isRightClick()) { + timer.removeTime(!event.isShiftClick() ? 60 * 60 * 24 : 60 * 60 * 24 * 10); + } + rebuildInventory(); + } + + case TIME_HOURS_INDEX -> { + Timer timer = plugin.getTimer(); + if (event.isLeftClick()) { + timer.addTime(!event.isShiftClick() ? 60 * 60 : 60 * 60 * 10); + } + + if (event.isRightClick()) { + timer.removeTime(!event.isShiftClick() ? 60 * 60 : 60 * 60 * 10); + } + rebuildInventory(); + } + + case TIME_MINUTES_INDEX -> { + Timer timer = plugin.getTimer(); + if (event.isLeftClick()) { + timer.addTime(!event.isShiftClick() ? 60 : 60 * 10); + } + + if (event.isRightClick()) { + timer.removeTime(!event.isShiftClick() ? 60 : 60 * 10); + } + rebuildInventory(); + } + + case TIME_SECONDS_INDEX -> { + Timer timer = plugin.getTimer(); + if (event.isLeftClick()) { + timer.addTime(!event.isShiftClick() ? 1 : 10); + } + + if (event.isRightClick()) { + timer.removeTime(!event.isShiftClick() ? 1 : 10); + } + rebuildInventory(); + } default -> { } } + + switch (slot) { + case CLOSE_INDEX -> player.closeInventory(); + } } @Override @@ -114,20 +174,29 @@ item = GUIUtils.createGuiItem(Material.MAGENTA_GLAZED_TERRACOTTA, ChatUtil.GREEN + "Timer Richtung - vorwärts"); } } - case SHOWTIMER_INDEX -> { + case SHOW_TIMER_INDEX -> { if (Config.getBoolean("showtimer")) { item = GUIUtils.createGuiItem(Material.OBSERVER, ChatUtil.GREEN + "Timer wird angezeigt!", true); } else { item = GUIUtils.createGuiItem(Material.OBSERVER, ChatUtil.RED + "Timer wird nicht angezeigt!", false); } } - case START_INDEX -> { + case TIMER_TOGGLE_INDEX -> { if (plugin.getTimer().isRunning()) { item = GUIUtils.createGuiItem(Material.CLOCK, ChatUtil.GREEN + "Timer gestartet", true); } else { item = GUIUtils.createGuiItem(Material.CLOCK, ChatUtil.RED + "Timer pausiert"); } } + case TIME_DAYS_INDEX -> + item = GUIUtils.createGuiItem(Material.GOLD_BLOCK, ChatUtil.GREEN + "Tage", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Tag" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "+10 Tage" + ChatUtil.BLUE + " ‣ Shift-Links-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Tag" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Tage" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); + case TIME_HOURS_INDEX -> + item = GUIUtils.createGuiItem(Material.GOLD_INGOT, ChatUtil.GREEN + "Stunden", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Stunde" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "+10 Stunden" + ChatUtil.BLUE + " ‣ Shift-Links-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Stunde" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Stunden" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); + case TIME_MINUTES_INDEX -> + item = GUIUtils.createGuiItem(Material.RAW_GOLD, ChatUtil.GREEN + "Minuten", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Minute" + ChatUtil.BLUE + " ‣ Rechts-Klick", ChatUtil.GREEN + "+10 Minuten" + ChatUtil.BLUE + " ‣ Shift-Rechts-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Minute" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Minuten" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); + case TIME_SECONDS_INDEX -> + item = GUIUtils.createGuiItem(Material.GOLD_NUGGET, ChatUtil.GREEN + "Sekunden", ChatUtil.ORANGE + ">> " + ChatUtil.BLUE + plugin.getTimer().formatTime(), "", ChatUtil.GREEN + "+1 Sekunde" + ChatUtil.BLUE + " ‣ Rechts-Klick", ChatUtil.GREEN + "+10 Sekunden" + ChatUtil.BLUE + " ‣ Shift-Rechts-Klick", ChatUtil.BLUE + "" + ChatColor.STRIKETHROUGH + " ", ChatUtil.GREEN + "-1 Sekunde" + ChatUtil.BLUE + " ‣ Links-Klick", ChatUtil.GREEN + "-10 Sekunden" + ChatUtil.BLUE + " ‣ Shift-Links-Klick"); + case CLOSE_INDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen"); default -> item = GUIUtils.EMPTY_ICON; } this.getInventory().setItem(i, item); diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java index 0e703a0..37e2410 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java @@ -33,7 +33,7 @@ private static final int SHUFFLE_RANDOM_DROP_INDEX = 1; private static final int BACK_INDEX = 7; - private static final int CLOSE_IDEX = 8; + private static final int CLOSE_INDEX = 8; private static final int SHARED_DAMAGE_INDEX = 19; private static final int FLOOR_IS_LAVA_INDEX = 20; @@ -328,7 +328,7 @@ switch (slot) { case BACK_INDEX -> new MainGui(player).open(); - case CLOSE_IDEX -> player.closeInventory(); + case CLOSE_INDEX -> player.closeInventory(); } } @@ -352,7 +352,7 @@ case SHUFFLE_RANDOM_DROP_INDEX -> item = GUIUtils.createGuiItem(Material.CHORUS_FLOWER, ChatUtil.GREEN + "Zufällige Drops neu mischen"); case BACK_INDEX -> item = CustomHeads.RAINBOW_ARROW_BACKWARD_II.getHead(ChatUtil.RED + "Zurück"); - case CLOSE_IDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen"); + case CLOSE_INDEX -> item = CustomHeads.RAINBOW_X.getHead(ChatUtil.RED + "Menü verlassen"); case SHARED_DAMAGE_INDEX -> { if (Config.getBoolean("sharedmg")) { diff --git a/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java b/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java index 312cf92..346f271 100644 --- a/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java +++ b/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java @@ -261,7 +261,6 @@ ChatUtil.sendNormalMessage(player, "Event Log gepastet: " + url); } plugin.getLogger().log(Level.SEVERE, "Event Log gepastet: " + url); - plugin.getScoreManager().resetScores(); } @Override diff --git a/src/main/java/de/fanta/challenges/teams/TeamUtils.java b/src/main/java/de/fanta/challenges/teams/TeamUtils.java index 41b8152..afedb7f 100644 --- a/src/main/java/de/fanta/challenges/teams/TeamUtils.java +++ b/src/main/java/de/fanta/challenges/teams/TeamUtils.java @@ -172,7 +172,8 @@ } public static void createScoreBoardTeams() { - if (Challenges.getPlugin().getSBManager().getScoreboard() instanceof Scoreboard scoreboard) { + if (Challenges.getPlugin().getSBManager().getScoreboard() instanceof Scoreboard currentScore) { + scoreboard = currentScore; if (teamscoreboardObjective == null) { teamscoreboardObjective = scoreboard.registerNewObjective("teams", "dummy", "Event"); teamscoreboardObjective.setDisplayName("Event"); diff --git a/src/main/java/de/fanta/challenges/utils/ItemTypeListUtil.java b/src/main/java/de/fanta/challenges/utils/ItemTypeListUtil.java deleted file mode 100644 index c41fbec..0000000 --- a/src/main/java/de/fanta/challenges/utils/ItemTypeListUtil.java +++ /dev/null @@ -1,26 +0,0 @@ -package de.fanta.challenges.utils; - -import org.bukkit.Material; - -import java.util.EnumSet; - -public class ItemTypeListUtil { - - private static final EnumSet INSTA_BREAK_BLOCK = EnumSet.noneOf(Material.class); - - static { - INSTA_BREAK_BLOCK.add(Material.GRASS); - INSTA_BREAK_BLOCK.add(Material.TALL_GRASS); - INSTA_BREAK_BLOCK.add(Material.FERN); - INSTA_BREAK_BLOCK.add(Material.LARGE_FERN); - INSTA_BREAK_BLOCK.add(Material.DEAD_BUSH); - INSTA_BREAK_BLOCK.add(Material.SUGAR_CANE); - INSTA_BREAK_BLOCK.add(Material.TORCH); - INSTA_BREAK_BLOCK.add(Material.FIRE); - INSTA_BREAK_BLOCK.add(Material.SOUL_FIRE); - } - - public static boolean isInstaBreakBlock(Material m) { - return INSTA_BREAK_BLOCK.contains(m); - } -} diff --git a/src/main/java/de/fanta/challenges/utils/Statistics.java b/src/main/java/de/fanta/challenges/utils/Statistics.java index c8f012b..a95d008 100644 --- a/src/main/java/de/fanta/challenges/utils/Statistics.java +++ b/src/main/java/de/fanta/challenges/utils/Statistics.java @@ -116,7 +116,7 @@ addSpeedRunWonSolo(uuid, (int) (plugin.getTimer().getTimeInMs() / 1000) * 1000); } else if (playerPlays == 2) { addSpeedRunWonDuo(uuid, (int) (plugin.getTimer().getTimeInMs() / 1000) * 1000); - } else if (playerPlays > 2) { + } else if (playerPlays >= 3) { addSpeedRunWonTeam(uuid, (int) (plugin.getTimer().getTimeInMs() / 1000) * 1000); } } @@ -133,7 +133,7 @@ addSpeedRunsPlayedSolo(uuid); } else if (playerPlays == 2) { addSpeedRunsPlayedDuo(uuid); - } else if (playerPlays > 2) { + } else if (playerPlays >= 3) { addSpeedRunsPlayedTeam(uuid); } }