From aae9b0c267e33b44d4d0e38dd3a7641d58ac502f Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Fri, 11 Mar 2022 17:23:42 +0100
Subject: [PATCH] Fix fireworks

---
 .../lobby/listener/InventoryInteraction.java      | 15 +++++++--------
 .../steamwar/lobby/portal/FightserverPortal.java  |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/de/steamwar/lobby/listener/InventoryInteraction.java b/src/de/steamwar/lobby/listener/InventoryInteraction.java
index 6093e0a..94c4b20 100644
--- a/src/de/steamwar/lobby/listener/InventoryInteraction.java
+++ b/src/de/steamwar/lobby/listener/InventoryInteraction.java
@@ -23,6 +23,7 @@ import de.steamwar.lobby.command.ModifyCommand;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
@@ -32,20 +33,18 @@ public class InventoryInteraction extends BasicListener {
     @EventHandler
     public void handlePlayerInteract(PlayerInteractEvent event) {
         ItemStack item = event.getItem();
-        if(item == null || item.getType() == Material.FIREWORK_ROCKET)
+        if(item == null)
             return;
 
+        if(item.getType() == Material.FIREWORK_ROCKET && (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) {
+            item.setAmount(2);
+            return;
+        }
+
         if(!ModifyCommand.modifying(event.getPlayer()))
             event.setCancelled(true);
     }
 
-    @EventHandler
-    public void handleItemConsume(PlayerItemConsumeEvent event) {
-        ItemStack item = event.getItem();
-        if (item.getType() == Material.FIREWORK_ROCKET)
-            item.setAmount(2);
-    }
-
     @EventHandler
     public void handlePlayerDropItem(PlayerDropItemEvent event) {
         event.setCancelled(true);
diff --git a/src/de/steamwar/lobby/portal/FightserverPortal.java b/src/de/steamwar/lobby/portal/FightserverPortal.java
index 716296c..24ec55d 100644
--- a/src/de/steamwar/lobby/portal/FightserverPortal.java
+++ b/src/de/steamwar/lobby/portal/FightserverPortal.java
@@ -215,7 +215,7 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
             case "PRE_RUNNING":
                 return "Kampfbeginn in";
             case "RUNNING":
-                return "Kampf läuft noch";
+                return "Kampf läuft";
             case "end":
             case "SPECTATE":
                 return "Zuschauerphase";