diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index 218dad3..4b9691c 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -6,7 +6,7 @@ package de.fanta.challenges; import de.fanta.challenges.challenges.RandomDrops; -import de.fanta.challenges.challenges.SBManager; +import de.fanta.challenges.challenges.ScoreBoardManager; import de.fanta.challenges.commands.CommandRegistration; import de.fanta.challenges.events.PlayerCountChangedEvent; import de.fanta.challenges.events.ServerStatusChangedEvent; @@ -48,6 +48,9 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.ScoreboardManager; +import org.bukkit.scoreboard.Team; public class Challenges extends JavaPlugin { private static Challenges plugin; @@ -64,7 +67,7 @@ private BackpackGui backpack; - private SBManager sbManager; + private ScoreBoardManager sbManager; public RandomDrops rndDrops; @@ -112,7 +115,7 @@ this.backpack.loadInventoryFromConfig(); getLogger().info("Plugin loaded!"); - this.sbManager = new SBManager(); + this.sbManager = new ScoreBoardManager(); timer.setTime(getConfig().getInt("timertime")); @@ -141,6 +144,8 @@ Bukkit.getPluginManager().callEvent(new TimerChangedEvent(timer.isRunning())); Bukkit.getPluginManager().callEvent(new PlayerCountChangedEvent(Bukkit.getOnlinePlayers().size())); }, 200L); + + //ScoreBoardManager.createPlayerTeam(); //TODO Add Teams } @Override @@ -201,7 +206,7 @@ } } - public SBManager getSBManager() { + public ScoreBoardManager getSBManager() { return this.sbManager; } diff --git a/src/main/java/de/fanta/challenges/challenges/SBManager.java b/src/main/java/de/fanta/challenges/challenges/SBManager.java deleted file mode 100644 index 05b5308..0000000 --- a/src/main/java/de/fanta/challenges/challenges/SBManager.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.fanta.challenges.challenges; - -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.scoreboard.DisplaySlot; -import org.bukkit.scoreboard.Objective; -import org.bukkit.scoreboard.RenderType; -import org.bukkit.scoreboard.Scoreboard; -import org.bukkit.scoreboard.ScoreboardManager; - -public class SBManager { - public void createScoreboard(Player p) { - ScoreboardManager manager = Bukkit.getScoreboardManager(); - Scoreboard sb = manager.getNewScoreboard(); - Objective TabHP = sb.registerNewObjective("§6Challenges", "health", "Challenges"); - TabHP.setDisplaySlot(DisplaySlot.PLAYER_LIST); - TabHP.setDisplayName("§cHP"); - TabHP.setRenderType(RenderType.HEARTS); - p.setScoreboard(sb); - } -} diff --git a/src/main/java/de/fanta/challenges/challenges/ScoreBoardManager.java b/src/main/java/de/fanta/challenges/challenges/ScoreBoardManager.java new file mode 100644 index 0000000..ff53e4d --- /dev/null +++ b/src/main/java/de/fanta/challenges/challenges/ScoreBoardManager.java @@ -0,0 +1,56 @@ +package de.fanta.challenges.challenges; + +import de.fanta.challenges.Challenges; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; +import org.bukkit.scoreboard.DisplaySlot; +import org.bukkit.scoreboard.Objective; +import org.bukkit.scoreboard.RenderType; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.ScoreboardManager; +import org.bukkit.scoreboard.Team; + +public class ScoreBoardManager { + + public void createHealthScoreboard(Player p) { + org.bukkit.scoreboard.ScoreboardManager manager = Bukkit.getScoreboardManager(); + Scoreboard sb = manager.getNewScoreboard(); + Objective TabHP = sb.registerNewObjective("§6Challenges", "health", "Challenges"); + TabHP.setDisplaySlot(DisplaySlot.PLAYER_LIST); + TabHP.setDisplayName("§cHP"); + TabHP.setRenderType(RenderType.HEARTS); + p.setScoreboard(sb); + } + + public void ScoreBoardEvent(Player p) { + ScoreboardManager manager = Bukkit.getScoreboardManager(); + Scoreboard board = manager.getNewScoreboard(); + Objective Event = board.registerNewObjective("§6Challenges", "Event", "Challenges"); + Team team = board.registerNewTeam("Event"); + team.addPlayer(p); + team.setColor(ChatColor.BLUE); + team.setPrefix(ChatColor.BLUE.toString()); + team.setDisplayName("Event"); + + Event.setDisplaySlot(DisplaySlot.SIDEBAR); + Event.setDisplayName(team.getPrefix() + team.getDisplayName()); + Event.setRenderType(RenderType.INTEGER); + + p.setScoreboard(board); + } + /*public void ScoreBoardTeam(Player p) { + Challenges.getPlugin().onEnable().team.addPlayer(p); + Team team = ; + this.team.setColor(ChatColor.GREEN); + team.setDisplayName("Player"); + team.setPrefix(ChatColor.GREEN.toString()); + p.setScoreboard(this.board); + }*/ + + public static void createPlayerTeam() { + ScoreboardManager manager = Bukkit.getScoreboardManager(); + Scoreboard board = manager.getNewScoreboard(); + Team team = board.registerNewTeam("Player"); + } +} diff --git a/src/main/java/de/fanta/challenges/commands/CommandRegistration.java b/src/main/java/de/fanta/challenges/commands/CommandRegistration.java index a857a1e..e3b1105 100644 --- a/src/main/java/de/fanta/challenges/commands/CommandRegistration.java +++ b/src/main/java/de/fanta/challenges/commands/CommandRegistration.java @@ -3,6 +3,7 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.commands.challenges.ChallengesCommand; import de.fanta.challenges.commands.challenges.ChallengesHelpCommand; +import de.fanta.challenges.commands.challenges.ChallengesKickCommand; import de.fanta.challenges.commands.coords.CoordsCommand; import de.fanta.challenges.commands.coords.CoordsDeleteCommand; import de.fanta.challenges.commands.coords.CoordsGetCommand; @@ -10,6 +11,8 @@ import de.fanta.challenges.commands.coords.CoordsShareCommand; import de.fanta.challenges.commands.editor.EditorCommand; import de.fanta.challenges.commands.editor.EditorSetCommand; +import de.fanta.challenges.commands.event.EventCommand; +import de.fanta.challenges.commands.event.EventToggleCommand; import de.fanta.challenges.commands.hp.HPAddCommand; import de.fanta.challenges.commands.hp.HPGetCommand; import de.fanta.challenges.commands.hp.HPMaxCommand; @@ -41,7 +44,7 @@ CommandRouter challengesRouter = new CommandRouter(plugin.getCommand("challenges")); challengesRouter.addCommandMapping(new ChallengesCommand(plugin)); challengesRouter.addCommandMapping(new ChallengesHelpCommand(plugin), "help"); - challengesRouter.addCommandMapping(new KickCommand(plugin), "kick"); + challengesRouter.addCommandMapping(new ChallengesKickCommand(plugin), "kick"); CommandRouter resetRouter = new CommandRouter(plugin.getCommand("reset")); @@ -82,5 +85,10 @@ CommandRouter leaveRouter = new CommandRouter(plugin.getCommand("leave")); leaveRouter.addCommandMapping(new LeaveCommand()); + + CommandRouter eventRouter = new CommandRouter(plugin.getCommand("event")); + eventRouter.addCommandMapping(new EventCommand(plugin)); + eventRouter.addCommandMapping(new EventToggleCommand(plugin, true), "enable"); + eventRouter.addCommandMapping(new EventToggleCommand(plugin, false), "disable"); } } diff --git a/src/main/java/de/fanta/challenges/commands/KickCommand.java b/src/main/java/de/fanta/challenges/commands/KickCommand.java deleted file mode 100644 index 19376bf..0000000 --- a/src/main/java/de/fanta/challenges/commands/KickCommand.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.fanta.challenges.commands; - -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.BanList; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class KickCommand extends SubCommand { - private final Challenges plugin; - - public KickCommand(Challenges plugin) { - this.plugin = plugin; - } - - @Override - public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { - if (!(sender instanceof Player)) { - ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); - return true; - } - if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { - if (args.hasNext()) { - String playerName = args.getNext(); - Player player = Bukkit.getPlayer(playerName); - - if (player == sender) { - ChatUtil.sendErrorMessage(sender,"Du kannst dich nicht selbst kicken"); - return true; - } - - if (player == null) { - ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); - } else { - player.performCommand("tt challenge"); - ChatUtil.sendWarningMessage(player, "Du wurdest vom Editor gekickt!"); - ChatUtil.sendWarningMessage(player, "Du kannst in einer Minute wieder Joinen"); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { - player.banPlayer("Du wurdest vom Editor gekickt"); - }, 5L); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { - Bukkit.getBanList(BanList.Type.NAME).pardon(player.getName()); - }, 20 * 60); - } - return true; - } - return false; - } else if (plugin.getCurrentEditor() != null) { - ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! Nur " + plugin.getCurrentEditor().getName() + " kann spieler kicken"); - return true; - } else { - ChatUtil.sendErrorMessage(sender, "Aktuell gibt es keinen Editor!"); - ChatUtil.sendErrorMessage(sender, "Um selbst Editor zu werden musst du dir im Freebuild VIP Kaufen!"); - return true; - } - } -} 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 fa2ef77..51de8bf 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesCommand.java @@ -17,7 +17,7 @@ @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { - ChatUtil.sendNormalMessage(sender, "Challenges v" + Challenges.getPlugin().getDescription().getVersion() + " by " + Challenges.getPlugin().getDescription().getAuthors()); + ChatUtil.sendNormalMessage(sender, "Challenges v" + plugin.getDescription().getVersion() + " by " + plugin.getDescription().getAuthors()); ChatUtil.sendNormalMessage(sender, "Nutze /challenges help für Hilfe"); return true; } diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java new file mode 100644 index 0000000..1d0c93e --- /dev/null +++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java @@ -0,0 +1,62 @@ +package de.fanta.challenges.commands.challenges; + +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.BanList; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class ChallengesKickCommand extends SubCommand { + private final Challenges plugin; + + public ChallengesKickCommand(Challenges plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { + if (!(sender instanceof Player)) { + ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); + return true; + } + if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { + if (args.hasNext()) { + String playerName = args.getNext(); + Player player = Bukkit.getPlayer(playerName); + + if (player == sender) { + ChatUtil.sendErrorMessage(sender,"Du kannst dich nicht selbst kicken"); + return true; + } + + if (player == null) { + ChatUtil.sendErrorMessage(sender, "Dieser Spieler ist nicht online!"); + } else { + player.performCommand("tt challenge"); + ChatUtil.sendWarningMessage(player, "Du wurdest vom Editor gekickt!"); + ChatUtil.sendWarningMessage(player, "Du kannst in einer Minute wieder Joinen"); + Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { + player.banPlayer("Du wurdest vom Editor gekickt"); + }, 5L); + Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { + Bukkit.getBanList(BanList.Type.NAME).pardon(player.getName()); + }, 20 * 60); + } + return true; + } + return false; + } else if (plugin.getCurrentEditor() != null) { + ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! Nur " + plugin.getCurrentEditor().getName() + " kann spieler kicken"); + return true; + } else { + ChatUtil.sendErrorMessage(sender, "Aktuell gibt es keinen Editor!"); + ChatUtil.sendErrorMessage(sender, "Um selbst Editor zu werden musst du dir im Freebuild VIP Kaufen!"); + return true; + } + } +} diff --git a/src/main/java/de/fanta/challenges/commands/event/EventCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventCommand.java new file mode 100644 index 0000000..72ad5a5 --- /dev/null +++ b/src/main/java/de/fanta/challenges/commands/event/EventCommand.java @@ -0,0 +1,34 @@ +package de.fanta.challenges.commands.event; + +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.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class EventCommand extends SubCommand { + private final Challenges plugin; + + public EventCommand(Challenges plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { + if (!(sender instanceof Player)) { + ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); + return true; + } + if (sender.hasPermission("challenges.event")) { + ChatUtil.sendNormalMessage(sender, "--- Event Commands ---"); + ChatUtil.sendNormalMessage(sender, "/event enable - aktiviert die Event Funktion"); + ChatUtil.sendNormalMessage(sender, "/event disable - deaktiviert die Event Funktion"); + ChatUtil.sendNormalMessage(sender, "/event settings - öffnet die Event Einstellungen"); + ChatUtil.sendNormalMessage(sender, "--- ************** ---"); + return true; + } + return false; + } +} diff --git a/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java new file mode 100644 index 0000000..ba448ad --- /dev/null +++ b/src/main/java/de/fanta/challenges/commands/event/EventToggleCommand.java @@ -0,0 +1,48 @@ +package de.fanta.challenges.commands.event; + +import com.google.gson.internal.$Gson$Preconditions; +import de.fanta.challenges.Challenges; +import de.fanta.challenges.challenges.ScoreBoardManager; +import de.fanta.challenges.utils.ChatUtil; +import de.fanta.challenges.utils.guiutils.GUIUtils; +import de.iani.cubesideutils.bukkit.commands.SubCommand; +import de.iani.cubesideutils.commands.ArgsParser; +import net.md_5.bungee.api.ChatColor; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class EventToggleCommand extends SubCommand { + + private final Challenges plugin; + private final boolean enable; + + public EventToggleCommand(Challenges plugin, boolean enable) { + this.plugin = plugin; + this.enable = enable; + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { + if (!sender.hasPermission("challenges.event")) { + ChatUtil.sendErrorMessage(sender, "Keine Berechtigung"); + return true; + } + if (enable) { + GUIUtils.setConfig("event", true); + GUIUtils.sendTitleToAll("Event", "Event Modus aktiviert", ChatColor.GREEN); + for (Player p : Bukkit.getOnlinePlayers()) { + //plugin.getSBManager().ScoreBoardEvent(p); + } + } else { + GUIUtils.setConfig("event", false); + GUIUtils.sendTitleToAll("Event", "Event Modus deaktiviert", ChatColor.RED); + for (Player p : Bukkit.getOnlinePlayers()) { + //plugin.getSBManager().ScoreBoardTeam(p); + } + } + + return true; + } +} diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java index bfdaeb8..1e63de7 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java @@ -144,12 +144,12 @@ plugin.getServer().getWorld("world").setGameRule(GameRule.KEEP_INVENTORY, false); plugin.getServer().getWorld("world_nether").setGameRule(GameRule.KEEP_INVENTORY, false); plugin.getServer().getWorld("world_the_end").setGameRule(GameRule.KEEP_INVENTORY, false); - GUIUtils.sendTitleToAll("Server Einstellungen", "Keep Inventory aktiviert", ChatColor.GREEN); + GUIUtils.sendTitleToAll("Server Einstellungen", "Keep Inventory deaktiviert", ChatColor.RED); } else { plugin.getServer().getWorld("world").setGameRule(GameRule.KEEP_INVENTORY, true); plugin.getServer().getWorld("world_nether").setGameRule(GameRule.KEEP_INVENTORY, true); plugin.getServer().getWorld("world_the_end").setGameRule(GameRule.KEEP_INVENTORY, true); - GUIUtils.sendTitleToAll("Server Einstellungen", "Keep Inventory deaktiviert", ChatColor.RED); + GUIUtils.sendTitleToAll("Server Einstellungen", "Keep Inventory aktiviert", ChatColor.GREEN); } break; case NATURAL_REGENERATION_INDEX: diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java index 4083591..607cfe3 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java @@ -72,9 +72,9 @@ SETTINGS_GUI.setItem(DEATH_ON_SPRINT_INDEX, GUIUtils.createGuiItem(Material.GLASS_BOTTLE, ChatColor.RED + "Tod bei Sprinten deaktiviert")); } if (plugin.getConfig().getBoolean("deathonjump")) { - SETTINGS_GUI.setItem(DEATH_ON_JUMP_INDEX, GUIUtils.createGuiItem(Material.RABBIT_FOOT, ChatColor.GREEN + "Tod bei Sprinten aktiviert", true)); + SETTINGS_GUI.setItem(DEATH_ON_JUMP_INDEX, GUIUtils.createGuiItem(Material.RABBIT_FOOT, ChatColor.GREEN + "Tod bei Springen aktiviert", true)); } else { - SETTINGS_GUI.setItem(DEATH_ON_JUMP_INDEX, GUIUtils.createGuiItem(Material.RABBIT_FOOT, ChatColor.RED + "Tod bei Sprinten deaktiviert")); + SETTINGS_GUI.setItem(DEATH_ON_JUMP_INDEX, GUIUtils.createGuiItem(Material.RABBIT_FOOT, ChatColor.RED + "Tod bei Springen deaktiviert")); } if (plugin.getConfig().getBoolean("target")) { SETTINGS_GUI.setItem(TARGET_INDEX, GUIUtils.createGuiItem(Material.DRAGON_HEAD, ChatColor.GREEN + "Ziel: Enderdrache Töten")); @@ -82,12 +82,12 @@ SETTINGS_GUI.setItem(TARGET_INDEX, GUIUtils.createGuiItem(Material.WITHER_SKELETON_SKULL, ChatColor.GREEN + "Ziel: Wither Töten")); } if (plugin.getConfig().getBoolean("clinvdmg")) { - SETTINGS_GUI.setItem(CLEANR_INV_BY_DAMAGE_INDEX, GUIUtils.createGuiItem(Material.BARRIER, ChatColor.GREEN + "Alle Inventare Löschen wenn einer Schaden bekommt aktieviert", true)); + SETTINGS_GUI.setItem(CLEANR_INV_BY_DAMAGE_INDEX, GUIUtils.createGuiItem(Material.BARRIER, ChatColor.GREEN + "Alle Inventare Löschen wenn einer Schaden bekommt aktiviert", true)); } else { SETTINGS_GUI.setItem(CLEANR_INV_BY_DAMAGE_INDEX, GUIUtils.createGuiItem(Material.BARRIER, ChatColor.RED + "Alle Inventare Löschen wenn einer Schaden bekommt deaktiviert")); } if (plugin.getConfig().getBoolean("damageonsneak")) { - SETTINGS_GUI.setItem(DMG_ON_SNEAK_INDEX, GUIUtils.createGuiItem(Material.SMOOTH_STONE_SLAB, ChatColor.GREEN + "Schaden bei Schleichen aktieviert", true, ChatColor.GREEN + "Schaden beim Schleichen: " + plugin.getConfig().getDouble("sneakdmg"))); + SETTINGS_GUI.setItem(DMG_ON_SNEAK_INDEX, GUIUtils.createGuiItem(Material.SMOOTH_STONE_SLAB, ChatColor.GREEN + "Schaden bei Schleichen aktiviert", true, ChatColor.GREEN + "Schaden beim Schleichen: " + plugin.getConfig().getDouble("sneakdmg"))); SETTINGS_GUI.setItem(DMG_ON_SNEAK_ADD_INDEX, CustomHeads.QUARTZ_ARROW_UP.getHead()); SETTINGS_GUI.setItem(DMG_ON_SNEAK_REMOVE_INDEX, CustomHeads.QUARTZ_ARROW_DOWN.getHead()); @@ -97,14 +97,14 @@ SETTINGS_GUI.setItem(DMG_ON_SNEAK_REMOVE_INDEX, GUIUtils.EMPTY_ICON); } if (plugin.getConfig().getBoolean("mlg.enabled")) { - SETTINGS_GUI.setItem(MLG_INDEX, GUIUtils.createGuiItem(Material.WATER_BUCKET, ChatColor.GREEN + "MLG aktieviert", true)); + SETTINGS_GUI.setItem(MLG_INDEX, GUIUtils.createGuiItem(Material.WATER_BUCKET, ChatColor.GREEN + "MLG aktiviert", true)); } else { SETTINGS_GUI.setItem(MLG_INDEX, GUIUtils.createGuiItem(Material.WATER_BUCKET, ChatColor.RED + "MLG deaktiviert")); } if (plugin.getConfig().getBoolean("sharedmg")) { - SETTINGS_GUI.setItem(SHARE_DMG_INDEX, GUIUtils.createGuiItem(Material.MELON_SLICE, ChatColor.GREEN + "Geteielter Schade aktiviert", true)); + SETTINGS_GUI.setItem(SHARE_DMG_INDEX, GUIUtils.createGuiItem(Material.MELON_SLICE, ChatColor.GREEN + "Geteilter Schade aktiviert", true)); } else { - SETTINGS_GUI.setItem(SHARE_DMG_INDEX, GUIUtils.createGuiItem(Material.MELON_SLICE, ChatColor.RED + "Geteielter Schade deaktiviert")); + SETTINGS_GUI.setItem(SHARE_DMG_INDEX, GUIUtils.createGuiItem(Material.MELON_SLICE, ChatColor.RED + "Geteilter Schade deaktiviert")); } SETTINGS_GUI.setItem(SHUFFLE_RANDOM_DROP_INDEX, GUIUtils.createGuiItem(Material.CHORUS_FLOWER, ChatColor.GREEN + "Zufällige Drops neu mischen")); SETTINGS_GUI.setItem(CLOSE_GUI_INDEX, GUIUtils.createGuiItem(Material.BARRIER, ChatColor.RED + "Menü Verlassen!")); @@ -205,27 +205,27 @@ case CLEANR_INV_BY_DAMAGE_INDEX: if (plugin.getConfig().getBoolean("clinvdmg")) { GUIUtils.setConfig("clinvdmg", false); - GUIUtils.sendTitleToAll("Challenge", "Inventar von allen Löschen wenn einer Schaden bekommt deaktieviert", ChatColor.RED); + GUIUtils.sendTitleToAll("Challenge", "Inventar von allen Löschen wenn einer Schaden bekommt deaktiviert", ChatColor.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Inventar von allen Löschen wenn einer Schaden bekommt deaktieviert", ChatColor.GREEN); + GUIUtils.sendTitleToAll("Challenge", "Inventar von allen Löschen wenn einer Schaden bekommt aktiviert", ChatColor.GREEN); GUIUtils.setConfig("clinvdmg", true); } break; case DMG_ON_SNEAK_INDEX: if (plugin.getConfig().getBoolean("damageonsneak")) { GUIUtils.setConfig("damageonsneak", false); - GUIUtils.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen deaktieviert", ChatColor.RED); + GUIUtils.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen deaktiviert", ChatColor.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen aktieviert", ChatColor.GREEN); + GUIUtils.sendTitleToAll("Challenge", "Schaden bekommen beim Schleichen aktiviert", ChatColor.GREEN); GUIUtils.setConfig("damageonsneak", true); } break; case MLG_INDEX: if (plugin.getConfig().getBoolean("mlg.enabled")) { GUIUtils.setConfig("mlg.enabled", false); - GUIUtils.sendTitleToAll("Challenge", "MLG deaktieviert", ChatColor.RED); + GUIUtils.sendTitleToAll("Challenge", "MLG deaktiviert", ChatColor.RED); } else { - GUIUtils.sendTitleToAll("Challenge", "MLG aktieviert", ChatColor.GREEN); + GUIUtils.sendTitleToAll("Challenge", "MLG aktiviert", ChatColor.GREEN); GUIUtils.setConfig("mlg.enabled", true); } break; @@ -240,10 +240,10 @@ case SHARE_DMG_INDEX: if (plugin.getConfig().getBoolean("sharedmg")) { GUIUtils.setConfig("sharedmg", false); - GUIUtils.sendTitleToAll("Challenge", "Geteielter Schaden deaktieviert", ChatColor.RED); + GUIUtils.sendTitleToAll("Challenge", "Geteielter Schaden deaktiviert", ChatColor.RED); } else { GUIUtils.setConfig("sharedmg", true); - GUIUtils.sendTitleToAll("Challenge", "Geteielter Schaden aktieviert", ChatColor.GREEN); + GUIUtils.sendTitleToAll("Challenge", "Geteielter Schaden aktiviert", ChatColor.GREEN); } break; diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java index 7ece023..0310fb6 100644 --- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java +++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java @@ -18,7 +18,6 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerQuitEvent; -import org.objectweb.asm.commons.SerialVersionUIDAdder; public class QuitJoinListener implements Listener { @@ -27,12 +26,14 @@ @EventHandler public void onPlayerJoin(PlayerJoinEvent e) { + Player p = e.getPlayer(); + //plugin.getSBManager().ScoreBoardTeam(p); if (resetTaskId > 0) { Bukkit.getScheduler().cancelTask(resetTaskId); resetTaskId = -1; } - Player p = e.getPlayer(); + Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatUtil.PLAYER + p.getName() + ChatUtil.NORMAL + " hat die Lobby betreten! " + ChatColor.of("#E4E737") + "[" + Bukkit.getServer().getOnlinePlayers().size() + "/" + Bukkit.getServer().getMaxPlayers() + "]"); e.setJoinMessage(null); if (plugin.getConfig().getBoolean("sharedmg")) { @@ -41,7 +42,7 @@ p.setHealth(rp.getHealth()); } if (this.plugin.getConfig().getBoolean("tabhp")) { - this.plugin.getSBManager().createScoreboard(p); + this.plugin.getSBManager().createHealthScoreboard(p); } if (plugin.getCurrentEditor() == null) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index ddb92f3..613c861 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -12,7 +12,7 @@ deathonjump: false xpdeath: false clinvdmg: false -tabhp: true +tabhp: false tntdeath: false target: true #Mögliche werte: 1-6 @@ -24,4 +24,5 @@ timertime: 0 Saved_Locations: {} World_Name: world -World_Reset: false \ No newline at end of file +World_Reset: false +event: false \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 27977a6..d4693c9 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -43,4 +43,7 @@ aliases: [l] kick: description: Spieler Kicken - usage: Use /kick \ No newline at end of file + usage: Use /kick + event: + description: Event + usage: Use /event \ No newline at end of file