From a51f03826cae0402dccd468a50ece2f2a510c430 Mon Sep 17 00:00:00 2001
From: Chaoscaot <max.spaeth01@gmail.com>
Date: Fri, 29 Jan 2021 21:27:17 +0100
Subject: [PATCH] Remove Code Duplication

---
 .../src/de/steamwar/fightsystem/kit/Kit.java  | 20 +++++++++++--------
 .../listener/PersonalKitCreator.java          | 19 +-----------------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/kit/Kit.java b/FightSystem_Main/src/de/steamwar/fightsystem/kit/Kit.java
index a7d6d8b..61049a9 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/kit/Kit.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/kit/Kit.java
@@ -162,6 +162,18 @@ public class Kit {
     public void preview(Player player){
         SWInventory inv = new SWInventory(player, 54, name);
 
+        preview(inv, inventory, armor, effects);
+
+        inv.setCallback(-999, (click) -> player.closeInventory());
+        inv.setItem(45, SWItem.getDye(10), (byte)10, "§aKit wählen", (click) -> {
+            Commands.kit(player, name);
+            player.closeInventory();
+        });
+        inv.setItem(53, SWItem.getDye(1), (byte)1, "§cZurück", (click) -> GUI.kitSelection(player));
+        inv.open();
+    }
+
+    public static void preview(SWInventory inv, ItemStack[] inventory, ItemStack[] armor, Collection<PotionEffect> effects) {
         //36 = Inventargröße
         for(int i = 0; i < 36; i++){
             if(inventory[i] == null)
@@ -191,13 +203,5 @@ public class Kit {
                 pos--;
             }
         }
-
-        inv.setCallback(-999, (click) -> player.closeInventory());
-        inv.setItem(45, SWItem.getDye(10), (byte)10, "§aKit wählen", (click) -> {
-            Commands.kit(player, name);
-            player.closeInventory();
-        });
-        inv.setItem(53, SWItem.getDye(1), (byte)1, "§cZurück", (click) -> GUI.kitSelection(player));
-        inv.open();
     }
 }
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
index dd16d57..668eb54 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
@@ -99,24 +99,7 @@ public class PersonalKitCreator extends BasicListener {
     public static void preview(Player player, PersonalKit kit){
         SWInventory inv = new SWInventory(player, 54, kit.getName());
 
-        //36 = Inventargröße
-        for(int i = 0; i < 36; i++){
-            if(kit.getInventory()[i] == null)
-                continue;
-            SWItem item = new SWItem();
-            item.setItemStack(kit.getInventory()[i]);
-            inv.setItem(i, item);
-        }
-
-        if(kit.getArmor() != null){
-            for(int i = 0; i < 4; i++){
-                if(kit.getArmor()[i] == null)
-                    continue;
-                SWItem item = new SWItem();
-                item.setItemStack(kit.getArmor()[i]);
-                inv.setItem(36 + i, item);
-            }
-        }
+        Kit.preview(inv, kit.getInventory(), kit.getArmor(), null);
 
         inv.setItem(45, Material.LEATHER_CHESTPLATE, "§aKit benutzen", clickType -> useKit(player, kit));
         inv.setItem(49, SWItem.getMaterial("WOOD_AXE"), "§7Kit bearbeiten", clickType -> openKitCreator(player, kit));