Merge pull request #106 from pupnewfster/sublocks

Should complete and close #86
Coders-After-Dark · May 24, 2018 · 8c46795 · 8c46795
2 parents c8c1615 + 00bfeed
commit 8c46795
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/codersafterdark/reskillable/api/data/ParentLockKey.java b/src/main/java/codersafterdark/reskillable/api/data/ParentLockKey.java
@@ -0,0 +1,12 @@
+package codersafterdark.reskillable.api.data;
+
+import codersafterdark.reskillable.base.LevelLockHandler;
+
+public interface ParentLockKey extends LockKey {
+    /**
+     * Retrieves any sub requirements this key may have.
+     * This usually can be implemented by calling {@link LevelLockHandler#getLocks(Class, Object[])}
+     * @return A RequirementHolder of the sub requirements.
+     */
+    RequirementHolder getSubRequirements();
+}
diff --git a/src/main/java/codersafterdark/reskillable/base/LevelLockHandler.java b/src/main/java/codersafterdark/reskillable/base/LevelLockHandler.java
@@ -221,6 +221,12 @@ public static <T> RequirementHolder getLocks(Class<? extends T> classType, T...
                 } else if (locks.containsKey(lock)) {
                     requirements.add(locks.get(lock));
                 }
+                if (lock instanceof ParentLockKey) {
+                    RequirementHolder subLocks = ((ParentLockKey) lock).getSubRequirements();
+                    if (subLocks != null && !subLocks.equals(EMPTY_LOCK)) {
+                        requirements.add(subLocks);
+                    }
+                }
             }
         }
 
@@ -305,9 +311,8 @@ public static void onArmorEquip(LivingEquipmentChangeEvent event) {
                 if (slot.getSlotType().equals(EntityEquipmentSlot.Type.ARMOR)) {
                     ItemStack stack = player.inventory.armorInventory.get(slot.getIndex());
                     if (!canPlayerUseItem(player, stack)) {
-                        ItemStack copy = stack.copy();
-                        if (!player.inventory.addItemStackToInventory(copy)) {
-                            player.dropItem(copy, false);
+                        if (!player.inventory.addItemStackToInventory(stack)) {
+                            player.dropItem(stack, false);
                         }
                         player.inventory.armorInventory.set(slot.getIndex(), ItemStack.EMPTY);
                         tellPlayer(player, stack, MessageLockedItem.MSG_ARMOR_EQUIP_LOCKED);