diff --git a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java index 75378d4..4102584 100644 --- a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java +++ b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java @@ -1,6 +1,7 @@ package de.fanta.challenges.commands.reset; import de.fanta.challenges.Challenges; +import de.fanta.challenges.events.EventStatusChangedEvent; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.SaveWorldUtils; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -10,16 +11,13 @@ import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; +import org.bukkit.event.block.BlockBreakEvent; import java.io.BufferedReader; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; -import java.util.Collection; -import java.util.Collections; -import java.util.List; import java.util.Properties; public class ResetConfirmCommand extends SubCommand { @@ -33,24 +31,12 @@ @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { if ((sender instanceof Player && plugin.isEditor((Player) sender)) || sender.hasPermission("Challenges.editor.override")) { - String datapack = ""; - if (args.hasNext()) { - datapack = args.getNext(); - if (datapack.equals("true")) { - plugin.getConfig().set("1-18-datapack", true); - plugin.saveConfig(); - ConsoleCommandSender console = Bukkit.getServer().getConsoleSender(); - String consolen_command = "/datapack enable \"file/CavesAndCliffsPreview.zip\""; - Bukkit.dispatchCommand(console, consolen_command); - } - } - try { BufferedReader in = new BufferedReader(new FileReader("server.properties")); Properties props = new Properties(); props.load(in); in.close(); - if (args.hasNext()) { + if (args.hasNext()) { //TODO Immer false??? Why ??? String seed = args.getNext(); props.setProperty("level-seed", seed); } else { @@ -65,6 +51,7 @@ plugin.getTimer().stopTimer(); plugin.getTimer().setTime(0); + Bukkit.getPluginManager().callEvent(new EventStatusChangedEvent(false)); for (Player p : Bukkit.getOnlinePlayers()) { if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { p.sendTitle(ChatColor.of("#0ddead") + "Server wird zurückgesetzt!", ChatUtil.RED + "Bitte warte einen Moment" + ChatColor.of("#0ddead") + "." + ChatColor.AQUA + "." + ChatColor.YELLOW + ".", 10, 220, 10); @@ -75,7 +62,6 @@ } plugin.delteTexturePack(); } - plugin.getConfig().set("World_Name", Bukkit.getWorlds().get(0).getName()); plugin.getConfig().set("World_Reset", true); for (String key : plugin.getConfig().getConfigurationSection("Saved_Locations").getKeys(false)) { plugin.getConfig().set("Saved_Locations." + key, null); @@ -97,14 +83,4 @@ } return true; } - - @Override - public Collection onTabComplete(CommandSender sender, Command command, String alias, ArgsParser args) { - args.next(); - if (!args.hasNext()) { - return List.of("true", "false"); - } - - return Collections.emptyList(); - } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 18b6d4f..3508310 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -37,7 +37,6 @@ firsttimerstart: false showtimer: true Saved_Locations: {} -World_Name: world World_Reset: false silkore: false ultrahardcore: false