diff --git a/src/main/java/net/brennholz/challenges/Backpack.java b/src/main/java/net/brennholz/challenges/Backpack.java index 4198d99..d15f57e 100644 --- a/src/main/java/net/brennholz/challenges/Backpack.java +++ b/src/main/java/net/brennholz/challenges/Backpack.java @@ -1,10 +1,7 @@ package net.brennholz.challenges; - - import java.util.Iterator; import java.util.Map; - import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.command.Command; @@ -16,62 +13,61 @@ import org.bukkit.inventory.ItemStack; public class Backpack implements CommandExecutor { - private Challenges chl = Challenges.getplugin(); - public Inventory Backpack = Bukkit.createInventory(null, 54, "§6Backpack"); + public static Inventory Backpack = Bukkit.createInventory(null, 54, "§6Backpack"); - @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { if (sender instanceof Player) { Player p = (Player) sender; if (p.hasPermission("challenges.backpack")) { p.openInventory(Backpack); - } else - p.sendMessage("§cDu hast hierfür keine Berechtigung"); - } else - sender.sendMessage("§cKein Konsolenbefehl!"); + } else { + p.sendMessage("hast hierfkeine Berechtigung"); + } + } else { + sender.sendMessage("Konsolenbefehl!"); + } return true; } - @SuppressWarnings("rawtypes") public void clearConfig() { - Iterator var2 = chl.getBackpackConfig().getKeys(false).iterator(); + Iterator var2 = this.chl.getBackpackConfig().getKeys(false).iterator(); while (var2.hasNext()) { String main_path = (String) var2.next(); - chl.getBackpackConfig().set(main_path, null); + this.chl.getBackpackConfig().set(main_path, null); } } public void saveInventoryToConfig() { clearConfig(); - for (int slot = 0; slot < this.Backpack.getSize(); slot++) { - ItemStack stack = this.Backpack.getItem(slot); - if ((stack != null) && (stack.getType() != Material.AIR)) { - chl.getBackpackConfig().set(String.valueOf(slot), stack.serialize()); - } + int slot = 0; + for (; slot < Backpack.getSize(); slot++) { + ItemStack stack = Backpack.getItem(slot); + if (stack != null && stack.getType() != Material.AIR) + this.chl.getBackpackConfig().set(String.valueOf(slot), stack.serialize()); } } @SuppressWarnings("rawtypes") public void loadInventoryFromConfig() { - Iterator var2 = chl.getBackpackConfig().getValues(false).entrySet().iterator(); - int slot; + Iterator var2 = this.chl.getBackpackConfig().getValues(false).entrySet().iterator(); while (var2.hasNext()) { + int slot; Map.Entry entry = (Map.Entry) var2.next(); try { slot = Integer.parseInt((String) entry.getKey()); } catch (NumberFormatException var6) { - chl.getServer().broadcastMessage("Fehler! Slot: " + (String) entry.getKey()); + this.chl.getServer().broadcastMessage("Fehler! Slot: " + (String) entry.getKey()); continue; } - if (slot >= this.Backpack.getSize()) { - chl.getServer().broadcastMessage("§cSlot " + slot + " befindet sich außerhalb des Inventars!"); - } else { - MemorySection memorySection = (MemorySection) entry.getValue(); - ItemStack deserialized = ItemStack.deserialize(memorySection.getValues(false)); - this.Backpack.setItem(slot, deserialized); + if (slot >= Backpack.getSize()) { + this.chl.getServer().broadcastMessage("" + slot + " befindet sich audes Inventars!"); + continue; } + MemorySection memorySection = (MemorySection) entry.getValue(); + ItemStack deserialized = ItemStack.deserialize(memorySection.getValues(false)); + Backpack.setItem(slot, deserialized); } } } diff --git a/src/main/java/net/brennholz/commands/Timer_Command.java b/src/main/java/net/brennholz/commands/Timer_Command.java index a0f407b..3db57e2 100644 --- a/src/main/java/net/brennholz/commands/Timer_Command.java +++ b/src/main/java/net/brennholz/commands/Timer_Command.java @@ -92,11 +92,11 @@ zeit = ttime; RefreshConfig(); for (Player p : chl.getServer().getOnlinePlayers()) { - p.sendActionBar("§aIn Challenge: §b" + thrs + ":" + tmin + ":" + tsek); + p.sendActionBar("§7In Challenge: §2" + thrs + ":" + tmin + ":" + tsek); } } else { for (Player p : chl.getServer().getOnlinePlayers()) { - p.sendActionBar("§6Timer pausiert..."); + p.sendActionBar("§cTimer pausiert..."); } } } diff --git a/src/main/java/net/brennholz/events/BlockDestroyListener.java b/src/main/java/net/brennholz/events/BlockDestroyListener.java index 458db8d..7297dbc 100644 --- a/src/main/java/net/brennholz/events/BlockDestroyListener.java +++ b/src/main/java/net/brennholz/events/BlockDestroyListener.java @@ -3,7 +3,6 @@ import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; @@ -31,29 +30,28 @@ @EventHandler public void onBlockExplode(BlockExplodeEvent e) { if (this.chl.getConfig().getBoolean("rnddrops") == true) { - e.setCancelled(true); - e.getBlock().getWorld().playSound(e.getBlock().getLocation(), Sound.ENTITY_GENERIC_EXPLODE, (float) 0.1, 1); e.blockList().forEach(block -> { if(!block.getType().isAir()){ block.getWorld().dropItem(block.getLocation().add(0.5D, 0.5D, 0.5D),new ItemStack(this.chl.getRandomDropsManager().getMaterialFromBlock(block))); block.setType(Material.AIR); } }); + e.blockList().clear(); } } @EventHandler public void onEntityExplode(EntityExplodeEvent e) { if (this.chl.getConfig().getBoolean("rnddrops") == true) { - e.setCancelled(true); - e.getEntity().getWorld().playSound(e.getEntity().getLocation(), Sound.ENTITY_GENERIC_EXPLODE, (float) 0.1, 1); e.blockList().forEach(block -> { if(!block.getType().isAir()){ block.getWorld().dropItem(block.getLocation().add(0.5D, 0.5D, 0.5D),new ItemStack(this.chl.getRandomDropsManager().getMaterialFromBlock(block))); - block.setType(Material.AIR); + block.setType(Material.AIR); } }); + e.blockList().clear(); } } + }