diff --git a/src/main/java/de/fanta/challenges/teams/TeamListener.java b/src/main/java/de/fanta/challenges/teams/TeamListener.java index 61fd21b..f229fc1 100644 --- a/src/main/java/de/fanta/challenges/teams/TeamListener.java +++ b/src/main/java/de/fanta/challenges/teams/TeamListener.java @@ -1,6 +1,7 @@ package de.fanta.challenges.teams; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.guis.eventgui.TeamSelectGUI; import de.fanta.challenges.utils.ChatUtil; import org.bukkit.Bukkit; @@ -35,6 +36,9 @@ @EventHandler public void onSwapItem(PlayerSwapHandItemsEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } Player p = e.getPlayer(); ItemStack stack = p.getInventory().getItemInMainHand(); ItemMeta meta = stack.getItemMeta(); @@ -45,6 +49,9 @@ @EventHandler public void onDrop(PlayerDropItemEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } ItemStack stack = e.getItemDrop().getItemStack(); ItemMeta meta = stack.getItemMeta(); if (meta != null && meta.getPersistentDataContainer().has(TeamUtils.getSelectKey())) { @@ -54,6 +61,9 @@ @EventHandler public void onItemMove(InventoryMoveItemEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } ItemStack stack = e.getItem(); ItemMeta meta = stack.getItemMeta(); if (meta != null && meta.getPersistentDataContainer().has(TeamUtils.getSelectKey())) { @@ -63,6 +73,9 @@ @EventHandler public void onItemClick(PlayerInteractEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } Player p = e.getPlayer(); ItemStack stack = p.getInventory().getItemInMainHand(); ItemMeta meta = stack.getItemMeta(); @@ -73,6 +86,9 @@ @EventHandler public void onPlace(BlockPlaceEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } Player p = e.getPlayer(); ItemStack stack = p.getInventory().getItemInMainHand(); ItemMeta meta = stack.getItemMeta(); @@ -83,6 +99,9 @@ @EventHandler public void onDrag(InventoryDragEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } ItemStack stack = e.getCursor(); if (stack != null) { ItemMeta meta = stack.getItemMeta(); @@ -94,6 +113,9 @@ @EventHandler public void onClick(InventoryClickEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } ItemStack stack = e.getCurrentItem(); if (stack != null) { ItemMeta meta = stack.getItemMeta(); @@ -105,6 +127,9 @@ @EventHandler(priority = EventPriority.MONITOR) public void onJoin(PlayerJoinEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } Inventory inventory = e.getPlayer().getInventory(); if (plugin.getConfig().getBoolean("event.teams") && plugin.getConfig().getBoolean("event.teamselect") && !plugin.getTimer().isRunning()) { inventory.setItem(8, TeamUtils.selctItem()); @@ -142,6 +167,9 @@ @EventHandler public void onDeath(PlayerRespawnEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } Player p = e.getPlayer(); Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { @@ -162,6 +190,9 @@ @EventHandler public void onLogin(PlayerLoginEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } if (plugin.getConfig().getBoolean("event.teams") && !plugin.getConfig().getBoolean("event.autoteams") && plugin.getTimer().isRunning()) { if (e.getPlayer().hasPermission("challenges.event")) { return; @@ -175,6 +206,9 @@ @EventHandler public void onDisconect(PlayerQuitEvent e) { + if (plugin.getServerType() == ServerType.ADVENTURE) { + return; + } if (plugin.getConfig().getBoolean("event.teams") && plugin.getTimer().isRunning()) { ChallengeTeam team = TeamUtils.getPlayerTeam(e.getPlayer()); if (team != null) {