diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
index a9f38555..6345f888 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
@@ -203,13 +203,23 @@ public class FightSchematic extends StateDependent {
         for(int i = 0; i < chars.length; i++){
             Clipboard character;
             try {
-                character = WorldeditWrapper.impl.loadChar(chars[i] == '/' ? "slash" : String.valueOf(chars[i]));
+                if (Character.isLowerCase(chars[i])) {
+                    character = WorldeditWrapper.impl.loadChar("lower/" + chars[i]);
+                } else if (Character.isUpperCase(chars[i])) {
+                    character = WorldeditWrapper.impl.loadChar("upper/" + chars[i]);
+                } else {
+                    character = WorldeditWrapper.impl.loadChar(chars[i] == '/' ? "slash" : String.valueOf(chars[i]));
+                }
             } catch (IOException e) {
-                Bukkit.getLogger().log(Level.WARNING, "Could not display character {} due to missing file!", chars[i]);
                 try {
-                    character = WorldeditWrapper.impl.loadChar("");
-                }catch (IOException ex) {
-                    throw new SecurityException("Could not load text", ex);
+                    character = WorldeditWrapper.impl.loadChar(chars[i] == '/' ? "slash" : String.valueOf(chars[i]));
+                } catch (IOException ex) {
+                    Bukkit.getLogger().log(Level.WARNING, "Could not display character {} due to missing file!", chars[i]);
+                    try {
+                        character = WorldeditWrapper.impl.loadChar("");
+                    }catch (IOException exc) {
+                        throw new SecurityException("Could not load text", exc);
+                    }
                 }
             }
 
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java
index 47709d76..32cf4618 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java
@@ -21,8 +21,6 @@ package de.steamwar.core;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.datafixers.util.Pair;
-import de.steamwar.Reflection;
-import net.minecraft.Util;
 import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
 import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
 import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
@@ -33,8 +31,6 @@ import org.bukkit.GameMode;
 
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.List;
-import java.util.function.LongSupplier;
 
 public class ProtocolWrapper21 implements ProtocolWrapper {
     @Override
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java
index 1331f826..43a22af9 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java
@@ -443,12 +443,14 @@ public class REntity {
     }
 
     private static final Reflection.Field<Integer> equipmentEntity = Reflection.getField(ProtocolWrapper.equipmentPacket, int.class, 0);
+    private static final Reflection.Field<List> equipmentSlots = Reflection.getField(ProtocolWrapper.equipmentPacket, List.class, 0);
 
     private static final Class<?> craftItemStack = Reflection.getClass("org.bukkit.craftbukkit.inventory.CraftItemStack");
     protected static final Reflection.Method asNMSCopy = Reflection.getTypedMethod(REntity.craftItemStack, "asNMSCopy", ProtocolWrapper.itemStack, ItemStack.class);
     protected Object getEquipmentPacket(Object slot, ItemStack stack){
         Object packet = Reflection.newInstance(ProtocolWrapper.equipmentPacket);
         equipmentEntity.set(packet, entityId);
+        equipmentSlots.set(packet, new ArrayList<>());
         ProtocolWrapper.impl.setEquipmentPacketStack(packet, slot, asNMSCopy.invoke(null, stack));
         return packet;
     }