Fix equip from use behavior, closes #332

TheIllusiveC4 · Aug 23, 2023 · 00aa122 · 00aa122
1 parent a535fc1
commit 00aa122
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/java/top/theillusivec4/curios/common/event/CuriosEventHandler.java b/src/main/java/top/theillusivec4/curios/common/event/CuriosEventHandler.java
@@ -393,7 +393,18 @@ public void curioRightClick(PlayerInteractEvent.RightClickItem evt) {
                   evt.setCanceled(true);
                   return;
                 } else if (firstSlot == null) {
-                  firstSlot = new Tuple<>(stackHandler, slotContext);
+                  CurioEquipEvent unequipEvent = new CurioEquipEvent(present, slotContext);
+                  MinecraftForge.EVENT_BUS.post(unequipEvent);
+                  result = unequipEvent.getResult();
+
+                  if (result == Event.Result.DENY) {
+                    continue;
+                  }
+
+                  if (result == Event.Result.ALLOW || CuriosApi.getCuriosHelper().getCurio(present)
+                      .map(c -> c.canUnequip(slotContext)).orElse(true)) {
+                    firstSlot = new Tuple<>(stackHandler, slotContext);
+                  }
                 }
               }
             }