From 169a6de01ac3cbd1684c865caae0dbe0b0484679 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 20 Sep 2019 06:02:48 +0200 Subject: [PATCH] Updating hotbar-GUI, removing abort --- src/de/steamwar/fightsystem/fight/FightTeam.java | 11 +++++------ .../fightsystem/listener/HotbarGUIListener.java | 4 ---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/de/steamwar/fightsystem/fight/FightTeam.java b/src/de/steamwar/fightsystem/fight/FightTeam.java index 1494200..ad156b5 100644 --- a/src/de/steamwar/fightsystem/fight/FightTeam.java +++ b/src/de/steamwar/fightsystem/fight/FightTeam.java @@ -144,7 +144,7 @@ public class FightTeam { player.teleport(spawn); if(KitManager.getKits(false).size() > 1) player.getInventory().setItem(1, new ItemBuilder(Material.LEATHER_CHESTPLATE).removeAllAtributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§eKit wählen").build()); - player.getInventory().setItem(4, new ItemBuilder(Material.BEACON).removeAllAtributs().setDisplayName("§eRespawn").build()); + player.getInventory().setItem(7, new ItemBuilder(Material.BEACON).removeAllAtributs().setDisplayName("§eRespawn").build()); TechHider.reloadChunks(player, chunksToReload); return fightPlayer; } @@ -199,12 +199,11 @@ public class FightTeam { else inventory.setItem(1, new ItemBuilder(Material.AIR).build()); if(!Config.event()){ - inventory.setItem(0, new ItemBuilder(Material.PAPER).removeAllAtributs().setDisplayName("§eSpieler einladen").build()); - inventory.setItem(2, new ItemBuilder(Material.FIREWORK_CHARGE).removeAllAtributs().setDisplayName("§cSpieler rauswerfen").build()); - inventory.setItem(3, new ItemBuilder(Material.INK_SACK, (short) 10).removeAllAtributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§cNicht bereit").build()); - inventory.setItem(5, new ItemBuilder(Material.INK_SACK, (short) 1).removeAllAtributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§4Abbrechen").build()); + inventory.setItem(2, new ItemBuilder(Material.PAPER).removeAllAtributs().setDisplayName("§eSpieler einladen").build()); + inventory.setItem(3, new ItemBuilder(Material.FIREWORK_CHARGE).removeAllAtributs().setDisplayName("§cSpieler rauswerfen").build()); + inventory.setItem(4, new ItemBuilder(Material.INK_SACK, (short) 10).removeAllAtributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§cNicht bereit").build()); } - inventory.setItem(7, new ItemBuilder(Material.CAULDRON_ITEM).removeAllAtributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§e" + Config.GameName + " wählen").build()); + inventory.setItem(0, new ItemBuilder(Material.CAULDRON_ITEM).removeAllAtributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§e" + Config.GameName + " wählen").build()); } public Set getPlayers() { diff --git a/src/de/steamwar/fightsystem/listener/HotbarGUIListener.java b/src/de/steamwar/fightsystem/listener/HotbarGUIListener.java index e0092db..05b82ad 100644 --- a/src/de/steamwar/fightsystem/listener/HotbarGUIListener.java +++ b/src/de/steamwar/fightsystem/listener/HotbarGUIListener.java @@ -1,6 +1,5 @@ package de.steamwar.fightsystem.listener; -import de.steamwar.fightsystem.FightSystem; import de.steamwar.fightsystem.commands.GUI; import de.steamwar.fightsystem.fight.Fight; import de.steamwar.fightsystem.fight.FightState; @@ -47,9 +46,6 @@ public class HotbarGUIListener extends BasicListener { case "§aBereit": fightTeam.setReady(false); break; - case "§4Abbrechen": - FightSystem.shutdown(FightSystem.PREFIX + "§6Das Team von §a" + fightTeam.getLeader().getPlayer().getName() + " §6hat den Kampf abgebrochen! \n Server stoppt..."); - break; case "§eKit wählen": GUI.kitSelection(player); break;