Fixed bug where MainHand item disappearing on Armor Stand swap

taggernation · Feb 27, 2022 · f5a54d5 · f5a54d5 · NoJokeFNA · Feb 28, 2022
1 parent f8f434e
commit f5a54d5
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/com/toonystank/armorswap/Events/ClickEvent.java b/src/main/java/com/toonystank/armorswap/Events/ClickEvent.java
@@ -62,14 +62,22 @@ public void onArmorStandRightClickEvent(PlayerInteractAtEntityEvent event) {
                 PlayerData.storeData(stand, map);
                 // armor stand set armor
                 for (DataType dataType : DataType.values()) {
+                    if (dataType.equals(DataType.ARMOR_STAND_SWAP)
+                            || dataType.equals(DataType.ITEM_FRAME_SWAP)
+                            || dataType.equals(DataType.MAIN_HAND_SWAP))
+                        continue;
                     if (!stand.hasArms()) {
-                        if (dataType.equals(DataType.PLAYER_MAIN_HAND) || dataType.equals(DataType.PLAYER_OFF_HAND) || dataType.equals(DataType.STAND_OFF_HAND))
+                        if (dataType.equals(DataType.PLAYER_MAIN_HAND)
+                                || dataType.equals(DataType.STAND_MAIN_HAND)
+                                || dataType.equals(DataType.PLAYER_OFF_HAND)
+                                || dataType.equals(DataType.STAND_OFF_HAND))
                             continue;
                     }
                     if (PlayerData.canMove(dataType, map)) {
                         PlayerData.setEquipment(dataType, stand, map);
                         PlayerData.setEquipment(dataType, player, map);
                     }
+
                 }
                 player.playSound(player.getLocation(), Sound.valueOf(sound), 1.0F, 1.0F);
             }