diff --git a/src/main/java/de/fanta/challenges/commands/event/EventCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventCommand.java index e21776d..6586d70 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventCommand.java @@ -28,7 +28,6 @@ ChatUtil.sendNormalMessage(sender, "/event settings - öffnet die Event-Einstellungen"); ChatUtil.sendNormalMessage(sender, "/event getscore [player] - zeigt den Score der Spieler"); ChatUtil.sendNormalMessage(sender, "--- ************** ---"); - ChatUtil.sendNormalMessage(sender, plugin.getVanish().getVanishPlayerList()); return true; } else { ChatUtil.sendErrorMessage(sender, "Keine Berechtigung!"); diff --git a/src/main/java/de/fanta/challenges/commands/event/EventSettingsCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventSettingsCommand.java index 51d01c7..2ca6e7f 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventSettingsCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventSettingsCommand.java @@ -25,14 +25,12 @@ if (sender.hasPermission("challenges.event")) { if (plugin.getConfig().getBoolean("event.enabled")) { EventGui.createEventGUI((Player) sender); - return true; } else { ChatUtil.sendErrorMessage(sender, "Dafür musst du das Event erst Starten"); - return true; } } else { ChatUtil.sendErrorMessage(sender, "Keine Berechtigung!"); - return true; } + return true; } } diff --git a/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java index 58880d8..8289231 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java @@ -1,6 +1,7 @@ package de.fanta.challenges.commands.event; import de.fanta.challenges.Challenges; +import de.fanta.challenges.guis.eventgui.EventItemsGui; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.guiutils.GUIUtils; import de.iani.cubesideutils.bukkit.commands.SubCommand; 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 4e66e22..99e47c7 100644 --- a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java +++ b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java @@ -1,7 +1,6 @@ package de.fanta.challenges.commands.reset; import de.fanta.challenges.Challenges; -import de.fanta.challenges.commands.BackpackCommand; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -18,7 +17,6 @@ public ResetConfirmCommand(Challenges plugin) { this.plugin = plugin; } - BackpackCommand backpack; @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { @@ -34,6 +32,19 @@ for (String key : plugin.getConfig().getConfigurationSection("Saved_Locations").getKeys(false)) { plugin.getConfig().set("Saved_Locations." + key, null); } + /*try { + BufferedReader in = new BufferedReader(new FileReader("server.properties")); + Properties props = new Properties(); + props.load(in); + System.out.println(props); + in.close(); + props.setProperty("level-seed", "penis"); + FileOutputStream out = new FileOutputStream("server.properties"); + props.store(out, null); + out.close(); + } catch (IOException e) { + e.printStackTrace(); + }*/ plugin.saveConfig(); plugin.setWaitingForShutdown(true); diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java index a735679..62b0ff3 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java @@ -37,7 +37,7 @@ } public static List getEventItems() { - return Arrays.stream(event_items.getContents()).filter(itemStack -> !itemStack.getType().equals(Material.AIR)).map(ItemStack::getType).collect(Collectors.toList()); + return Arrays.stream(event_items.getContents()).filter(itemStack -> itemStack != null && !itemStack.getType().equals(Material.AIR)).map(ItemStack::getType).collect(Collectors.toList()); } public static Map getPlayerInvs() { diff --git a/src/main/java/de/fanta/challenges/listeners/BingoListener.java b/src/main/java/de/fanta/challenges/listeners/BingoListener.java index 146d627..d0fe660 100644 --- a/src/main/java/de/fanta/challenges/listeners/BingoListener.java +++ b/src/main/java/de/fanta/challenges/listeners/BingoListener.java @@ -15,14 +15,14 @@ @EventHandler public void onActivation(TimerChangedEvent event){ - if (Objects.equals(plugin.getConfig().getString("event.type"), "bingo")){ + if (Objects.equals(plugin.getConfig().getString("event.type"), "bingo")) { Bingo bingo = plugin.getBingo(); - if(event.isRunning()) { + if (event.isRunning()) { bingo.setMaterials(EventItemsGui.getEventItems()); bingo.setRunning(true); - }else{ + } else { bingo.setRunning(false); } } } -} +} \ No newline at end of file