diff --git a/src/main/java/de/fanta/challenges/commands/ChallengesCommand.java b/src/main/java/de/fanta/challenges/commands/ChallengesCommand.java index b981b11..12e9a50 100644 --- a/src/main/java/de/fanta/challenges/commands/ChallengesCommand.java +++ b/src/main/java/de/fanta/challenges/commands/ChallengesCommand.java @@ -23,7 +23,7 @@ return true; } - if (plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) { + if ((plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) || sender.hasPermission("Challenges.editor.override")) { ChatUtil.sendNormalMessage(sender, "Challenges Version " + Challenges.getplugin().getDescription().getVersion() + " von " + Challenges.getplugin().getDescription().getAuthors()); ChatUtil.sendNormalMessage(sender, "Verfügbare Befehle:"); ChatUtil.sendNormalMessage(sender, "/HP - Verwalte die HP einzelner Spieler"); diff --git a/src/main/java/de/fanta/challenges/commands/HPCommand.java b/src/main/java/de/fanta/challenges/commands/HPCommand.java index caf4403..8a9fa92 100644 --- a/src/main/java/de/fanta/challenges/commands/HPCommand.java +++ b/src/main/java/de/fanta/challenges/commands/HPCommand.java @@ -20,7 +20,7 @@ @SuppressWarnings("deprecation") @Override public boolean onCommand(CommandSender sender, Command cmd, String lable, String[] args) { - if (plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) { + if ((plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) || sender.hasPermission("Challenges.editor.override")) { if (args.length >= 2) { if (args[0].equalsIgnoreCase("max")) { if (Double.parseDouble(args[1]) > 0) { diff --git a/src/main/java/de/fanta/challenges/commands/ResetCommand.java b/src/main/java/de/fanta/challenges/commands/ResetCommand.java index f58204a..4f81c8e 100644 --- a/src/main/java/de/fanta/challenges/commands/ResetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/ResetCommand.java @@ -26,7 +26,7 @@ ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); return true; } - if (plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) { + if ((plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) || sender.hasPermission("Challenges.editor.override")) { plugin.getConfig().set("World_Name", Bukkit.getWorlds().get(0).getName()); plugin.getConfig().set("World_Reset", true); plugin.getConfig().set("timer.enabled", false); diff --git a/src/main/java/de/fanta/challenges/commands/ReviveCommand.java b/src/main/java/de/fanta/challenges/commands/ReviveCommand.java index 64ecc1e..bf93e37 100644 --- a/src/main/java/de/fanta/challenges/commands/ReviveCommand.java +++ b/src/main/java/de/fanta/challenges/commands/ReviveCommand.java @@ -23,7 +23,7 @@ @SuppressWarnings("deprecation") @Override public boolean onCommand(CommandSender sender, Command cmd, String lable, String[] args) { - if (plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) { + if ((plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) || sender.hasPermission("Challenges.editor.override")) { if (args.length == 1) { if (args[0].equalsIgnoreCase("all")) { for (Player p : Bukkit.getOnlinePlayers()) { diff --git a/src/main/java/de/fanta/challenges/commands/SettingsCommand.java b/src/main/java/de/fanta/challenges/commands/SettingsCommand.java index 7502955..15eed7b 100644 --- a/src/main/java/de/fanta/challenges/commands/SettingsCommand.java +++ b/src/main/java/de/fanta/challenges/commands/SettingsCommand.java @@ -22,7 +22,7 @@ if (sender instanceof Player) { Player p = (Player) sender; if (args.length == 0) { - if (plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) { + if ((plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) || sender.hasPermission("Challenges.editor.override")) { WolfyUtilities.getAPI(plugin).getInventoryAPI().openCluster(p, "none"); return true; } else { @@ -30,7 +30,7 @@ } } else if (args.length == 1) { if (args[0].equalsIgnoreCase("get")) { - if (plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) { + if ((plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) || sender.hasPermission("Challenges.editor.override")) { ChatUtil.sendNormalMessage(p, "Einstellungen"); ChatUtil.sendNormalMessage(p, "Crafting = " + plugin.getConfig().getBoolean("craftingtable")); ChatUtil.sendNormalMessage(p, "Villager Handel = " + plugin.getConfig().getBoolean("allowtrading")); @@ -53,7 +53,7 @@ ChatUtil.sendWarningMessage(p, "/settings Get/Crafting/Trading/DeathFall/DMGOnSneak/SneakDMG/RndDrops/ShareDMG/Respawn/OneLife/ChatDMG/MLG/MLGkillall/MLGTime/DeathXP/SprintDeath/JumpDeath [True/False]"); } } else if (args.length >= 2) { - if (plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) { + if ((plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) || sender.hasPermission("Challenges.editor.override")) { Boolean Bwert = Boolean.valueOf(Boolean.parseBoolean(args[1])); switch (args[0].toLowerCase()) { case "crafting": diff --git a/src/main/java/de/fanta/challenges/commands/TimerCommand.java b/src/main/java/de/fanta/challenges/commands/TimerCommand.java index 048789e..2b264f7 100644 --- a/src/main/java/de/fanta/challenges/commands/TimerCommand.java +++ b/src/main/java/de/fanta/challenges/commands/TimerCommand.java @@ -37,9 +37,9 @@ @Override public boolean onCommand(CommandSender sender, Command cmd, String lable, String[] args) { - if (plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) { + if ((plugin.getCurrentEditor() != null && ((Player) sender).getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) || sender.hasPermission("Challenges.editor.override")) { if (args.length == 1) { - if (args[0].equalsIgnoreCase("resume")) { + if (args[0].equalsIgnoreCase("start")) { this.plugin.CheckMLGWorld(); if (!this.plugin.getConfig().getBoolean("timer.enabled")) { this.plugin.getConfig().set("timer.enabled", Boolean.valueOf(true)); @@ -79,7 +79,7 @@ ChatUtil.sendWarningMessage(sender, "Ein MLG findet bereits statt!"); } } else { - ChatUtil.sendWarningMessage(sender, "Benutze: /timer resume/pause/reset/reverse/set [Zeit in Sekunden]"); + ChatUtil.sendWarningMessage(sender, "Benutze: /timer start/pause/reset/reverse/set [Zeit in Sekunden]"); } } else if (args.length >= 2) { if (args[0].equalsIgnoreCase("set")) { @@ -87,11 +87,11 @@ Bukkit.broadcastMessage(Challenges.PREFIX + " §bDer Timer wurde auf §a" + this.hrs + ":" + this.smin + ":" + this.ssek + " §bgesetzt!"); } else { - ChatUtil.sendWarningMessage(sender, "Benutze: /timer resume/pause/reset/reverse/set [Zeit in Sekunden]"); + ChatUtil.sendWarningMessage(sender, "Benutze: /timer start/pause/reset/reverse/set [Zeit in Sekunden]"); } } else { ChatUtil.sendNormalMessage(sender, "~~~~~ Timer command ~~~~~"); - ChatUtil.sendNormalMessage(sender, "/timer resume - Setze den Timer fort"); + ChatUtil.sendNormalMessage(sender, "/timer start - Setze den Timer fort"); ChatUtil.sendNormalMessage(sender, "/timer pause - Pausiere den Timer"); ChatUtil.sendNormalMessage(sender, "/timer reset - Setze den Timer zurück"); ChatUtil.sendNormalMessage(sender, "/timer set [Zeit in Sekunden] - Setze den Timer auf eine bestimmte Zeit"); diff --git a/src/main/java/de/fanta/challenges/events/BlockCreateListener.java b/src/main/java/de/fanta/challenges/events/BlockCreateListener.java index eda3dd7..03ecf38 100644 --- a/src/main/java/de/fanta/challenges/events/BlockCreateListener.java +++ b/src/main/java/de/fanta/challenges/events/BlockCreateListener.java @@ -14,14 +14,14 @@ @EventHandler public void onBlockPlace(BlockPlaceEvent e) { - if (this.chl.getConfig().getBoolean("timer.enabled") == false) { + if (!this.chl.getConfig().getBoolean("timer.enabled")) { e.setCancelled(true); } } @EventHandler public void onBucketPlace(PlayerBucketEmptyEvent e) { - if (this.chl.getConfig().getBoolean("timer.enabled") == false) { + if (!this.chl.getConfig().getBoolean("timer.enabled")) { e.setCancelled(true); } } diff --git a/src/main/java/de/fanta/challenges/events/DamageListener.java b/src/main/java/de/fanta/challenges/events/DamageListener.java index 1721d71..01b9431 100644 --- a/src/main/java/de/fanta/challenges/events/DamageListener.java +++ b/src/main/java/de/fanta/challenges/events/DamageListener.java @@ -31,8 +31,8 @@ String dmg = new DecimalFormat("#.##").format(e.getFinalDamage()); if (e.getFinalDamage() > 0) { if (e.getCause() == DamageCause.FALL) { - if (chl.getConfig().getBoolean("deathonfall") == true) { - if (chl.getConfig().getBoolean("dmginchat") == true) { + if (chl.getConfig().getBoolean("deathonfall")) { + if (chl.getConfig().getBoolean("dmginchat")) { Bukkit.broadcastMessage(Challenges.PREFIX + "§6 " + p.getName() + " §chat §4" + p.getHealth() + " §cHP Schaden genommen durch §4" + e.getCause()); } Bukkit.getScheduler().scheduleSyncDelayedTask(chl, new Runnable() { @@ -41,19 +41,19 @@ p.setHealth(0); } }, 1); - } else if (chl.getConfig().getBoolean("dmginchat") == true) { + } else if (chl.getConfig().getBoolean("dmginchat")) { Bukkit.broadcastMessage(Challenges.PREFIX + "§6 " + p.getName() + " §chat §4" + dmg + " §cHP Schaden genommen durch §4" + e.getCause()); } } else if (e.getCause() == DamageCause.CUSTOM) { - if (!p.isSneaking() && (chl.getConfig().getBoolean("dmginchat") == true)) { + if (!p.isSneaking() && (chl.getConfig().getBoolean("dmginchat"))) { Bukkit.broadcastMessage(Challenges.PREFIX + "§6 " + p.getName() + " §chat §4" + chl.getConfig().getDouble("sneakdmg") + " §cHP Schaden genommen durch §4SNEAKING"); } } else if (e.getCause() == DamageCause.ENTITY_ATTACK || e.getCause() == DamageCause.ENTITY_EXPLOSION) { - } else if (chl.getConfig().getBoolean("dmginchat") == true) { + } else if (chl.getConfig().getBoolean("dmginchat")) { Bukkit.broadcastMessage(Challenges.PREFIX + "§6 " + p.getName() + " §chat §4" + dmg + " §cHP Schaden genommen durch §4" + e.getCause()); } - if (chl.getConfig().getBoolean("sharedmg") == true) { + if (chl.getConfig().getBoolean("sharedmg")) { for (Player pp : Bukkit.getOnlinePlayers()) { if (pp != p) { double health = pp.getHealth() - e.getFinalDamage(); @@ -79,7 +79,7 @@ if ((e.getEntity() instanceof Player) && (e.getFinalDamage() > 0)) { Player p = (Player) e.getEntity(); String dmg = new DecimalFormat("#.##").format(e.getFinalDamage()); - if ((e.getCause() == DamageCause.ENTITY_ATTACK || e.getCause() == DamageCause.ENTITY_EXPLOSION) && chl.getConfig().getBoolean("dmginchat") == true) { + if ((e.getCause() == DamageCause.ENTITY_ATTACK || e.getCause() == DamageCause.ENTITY_EXPLOSION) && chl.getConfig().getBoolean("dmginchat")) { Bukkit.broadcastMessage(Challenges.PREFIX + "§6 " + p.getName() + " §chat §4" + dmg + " §cHP Schaden genommen durch §4" + e.getDamager().getName()); } } @@ -91,8 +91,8 @@ Player p = e.getPlayer(); if (p.getGameMode() == GameMode.SURVIVAL) { if (!p.isSneaking()) { - if (chl.getConfig().getBoolean("damageonsneak") == true) { - if (chl.getConfig().getBoolean("tntdeath") == true) { + if (chl.getConfig().getBoolean("damageonsneak")) { + if (chl.getConfig().getBoolean("tntdeath")) { for (Player pp : Bukkit.getOnlinePlayers()) { pp.sendTitle("§c" + p.getDisplayName().toString() + " §ahat gesneakt!", "§b:>"); EntityType tnt = EntityType.PRIMED_TNT; @@ -117,8 +117,8 @@ Player p = e.getPlayer(); if (p.getGameMode() == GameMode.SURVIVAL) { if (!p.isSprinting()) { - if (chl.getConfig().getBoolean("deathonsprint") == true) { - if (chl.getConfig().getBoolean("tntdeath") == true) { + if (chl.getConfig().getBoolean("deathonsprint")) { + if (chl.getConfig().getBoolean("tntdeath")) { for (Player pp : Bukkit.getOnlinePlayers()) { pp.sendTitle("§c" + p.getDisplayName().toString() + " §aist gesprintet!", "§bBOOOM :>"); EntityType tnt = EntityType.PRIMED_TNT; @@ -139,11 +139,11 @@ @SuppressWarnings("deprecation") @EventHandler - public void PlayerJump(PlayerJumpEvent e) { + public void onPlayerJump(PlayerJumpEvent e) { Player p = e.getPlayer(); if (p.getGameMode() == GameMode.SURVIVAL) { - if (chl.getConfig().getBoolean("deathonjump") == true) { - if (chl.getConfig().getBoolean("tntdeath") == true) { + if (chl.getConfig().getBoolean("deathonjump")) { + if (chl.getConfig().getBoolean("tntdeath")) { for (Player pp : Bukkit.getOnlinePlayers()) { pp.sendTitle("§c" + p.getDisplayName().toString() + " §aist gesprungen!", "§bBOOOM :>"); EntityType tnt = EntityType.PRIMED_TNT; @@ -164,7 +164,7 @@ @EventHandler public void onDamageclear(EntityDamageEvent e) { if (e.getEntity() instanceof Player) { - if (chl.getConfig().getBoolean("clinvdmg") == true) { + if (chl.getConfig().getBoolean("clinvdmg")) { for (Player pp : Bukkit.getOnlinePlayers()) { pp.getInventory().clear(); ChatUtil.sendNormalMessage(pp, e.getEntity().getName() + " hat Schaden bekommen! Alle Inventare wurden gelöscht!"); @@ -176,11 +176,11 @@ @SuppressWarnings("deprecation") @EventHandler - public void PlayerGetXPJump(PlayerExpChangeEvent e) { + public void PlayerGetXP(PlayerExpChangeEvent e) { Player p = e.getPlayer(); if (p.getGameMode() == GameMode.SURVIVAL) { - if (chl.getConfig().getBoolean("xpdeath") == true) { - if (chl.getConfig().getBoolean("tntdeath") == true) { + if (chl.getConfig().getBoolean("xpdeath")) { + if (chl.getConfig().getBoolean("tntdeath")) { for (Player pp : Bukkit.getOnlinePlayers()) { pp.sendTitle("§c" + p.getDisplayName().toString() + " §ahat XP eingesammelt!", "§bPling :>"); EntityType tnt = EntityType.PRIMED_TNT; diff --git a/src/main/java/de/fanta/challenges/events/DeathListener.java b/src/main/java/de/fanta/challenges/events/DeathListener.java index 0d92a81..7e78c1c 100644 --- a/src/main/java/de/fanta/challenges/events/DeathListener.java +++ b/src/main/java/de/fanta/challenges/events/DeathListener.java @@ -67,7 +67,7 @@ chl.getServer().broadcastMessage(""); chl.getServer().broadcastMessage(""); chl.getServer().broadcastMessage(""); - chl.getServer().broadcastMessage(""); + Bukkit.broadcastMessage(""); } } } diff --git a/src/main/java/de/fanta/challenges/events/InteractListener.java b/src/main/java/de/fanta/challenges/events/InteractListener.java index 04309bd..ff1816d 100644 --- a/src/main/java/de/fanta/challenges/events/InteractListener.java +++ b/src/main/java/de/fanta/challenges/events/InteractListener.java @@ -5,6 +5,7 @@ import de.fanta.challenges.Challenges; import org.bukkit.Material; import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; @@ -19,11 +20,11 @@ public void onBlockClick(PlayerInteractEvent e) { if (e.getAction() == Action.RIGHT_CLICK_BLOCK) { if (e.getClickedBlock().getType() == Material.CRAFTING_TABLE) { - if (chl.getConfig().getBoolean("craftingtable") == false) { + if (!chl.getConfig().getBoolean("craftingtable")) { e.setCancelled(true); } } - if (this.chl.getConfig().getBoolean("timer.enabled") == false) { + if (!this.chl.getConfig().getBoolean("timer.enabled")) { e.setCancelled(true); } } @@ -32,11 +33,11 @@ @EventHandler public void onEntityClick(PlayerInteractEntityEvent e) { if (e.getRightClicked().getType() == EntityType.VILLAGER) { - if (chl.getConfig().getBoolean("allowtrading") == false) { + if (!chl.getConfig().getBoolean("allowtrading")) { e.setCancelled(true); } } - if (this.chl.getConfig().getBoolean("timer.enabled") == false) { + if (!this.chl.getConfig().getBoolean("timer.enabled")) { e.setCancelled(true); } } diff --git a/src/main/java/de/fanta/challenges/events/QuitJoinListener.java b/src/main/java/de/fanta/challenges/events/QuitJoinListener.java index e9eb374..0bb2cc4 100644 --- a/src/main/java/de/fanta/challenges/events/QuitJoinListener.java +++ b/src/main/java/de/fanta/challenges/events/QuitJoinListener.java @@ -19,14 +19,14 @@ @EventHandler public void PlayerJoinEvent(PlayerJoinEvent e) { Player p = e.getPlayer(); - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.GOLD + p.getName() + ChatColor.GREEN + " hat die Lobby betreten! " + ChatColor.BLUE + "[" + Bukkit.getServer().getOnlinePlayers().size() + "/" + + Bukkit.getServer().getMaxPlayers() + "]"); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.GOLD + p.getName() + ChatColor.GREEN + " hat die Lobby betreten! " + ChatColor.BLUE + "[" + Bukkit.getServer().getOnlinePlayers().size() + "/" + Bukkit.getServer().getMaxPlayers() + "]"); e.setJoinMessage(null); - if (chl.getConfig().getBoolean("sharedmg") == true) { + if (chl.getConfig().getBoolean("sharedmg")) { int rnd = new Random().nextInt(Bukkit.getOnlinePlayers().size()); Player rp = (Player) Bukkit.getServer().getOnlinePlayers().toArray()[rnd]; p.setHealth(rp.getHealth()); } - if (this.chl.getConfig().getBoolean("tabhp") == true) { + if (this.chl.getConfig().getBoolean("tabhp")) { this.chl.getSBManager().createScoreboard(p); } @@ -47,7 +47,7 @@ @EventHandler public void PlayerQuitEvent(PlayerQuitEvent e) { Player p = e.getPlayer(); - Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.GOLD + p.getName() + ChatColor.GREEN + " hat die Lobby verlassen! " + ChatColor.BLUE + "[" + Bukkit.getServer().getOnlinePlayers().size() + "/" + + Bukkit.getServer().getMaxPlayers() + "]"); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.GOLD + p.getName() + ChatColor.GREEN + " hat die Lobby verlassen! " + ChatColor.BLUE + "[" + (Bukkit.getServer().getOnlinePlayers().size() - 1) + "/" + Bukkit.getServer().getMaxPlayers() + "]"); e.setQuitMessage(null); if (Bukkit.getOnlinePlayers().size() == 1) {