diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
index fa6e642..bbb6e2d 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
@@ -57,6 +57,7 @@ public class FightSystem extends JavaPlugin {
         new PlayerStateListener();
         new ProjectileLaunchListener();
         new InFightDamageListener();
+        new InFightInventoryListener();
         new FreezeWorldStateListener();
         new EventJoinListener();
         new CheckListener();
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/InFightInventoryListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/InFightInventoryListener.java
index c36c06d..8cef341 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/InFightInventoryListener.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/InFightInventoryListener.java
@@ -67,20 +67,14 @@ public class InFightInventoryListener extends BasicListener {
     @EventHandler
     public void onBlockBreak(BlockBreakEvent event) {
         Inventory inventory = event.getPlayer().getInventory();
-        System.out.println("Inventory: " + inventory);
         int inventorySize = inventory.getSize();
-        System.out.println("Inventory Size: " + inventorySize);
 
         Material type = event.getBlock().getType();
-        System.out.println("Type: " + type);
         ItemStack itemStack;
 
-        System.out.println("Searching Type Slot");
-
         for (int i = 0; i < inventorySize; i++) {
             itemStack = inventory.getItem(i);
             if (itemStack != null && itemStack.getType().equals(type) && itemStack.getAmount() != itemStack.getMaxStackSize()) {
-                System.out.println("Slot Found: " + i);
                 itemStack.setType(type);
                 itemStack.setAmount(itemStack.getAmount() + 1);
                 inventory.setItem(i, itemStack);
@@ -89,14 +83,10 @@ public class InFightInventoryListener extends BasicListener {
             }
         }
 
-        System.out.println("Searching Empty Slot");
-
         for (int i = 0; i < inventorySize; i++) {
             itemStack = inventory.getItem(i);
-            if (itemStack != null && itemStack.getType().equals(Material.AIR)) {
-                System.out.println("Slot Found: " + i);
-                itemStack.setType(type);
-                itemStack.setAmount(1);
+            if (itemStack == null || itemStack.getType().equals(Material.AIR)) {
+                itemStack = new ItemStack(type, 1);
                 inventory.setItem(i, itemStack);
                 event.getPlayer().updateInventory();
                 return;