GH-44 Fix drop switching (Closes #44)

zrdzn · Aug 14, 2023 · 289afdc · 289afdc
1 parent 064cb15
commit 289afdc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/plugin/src/main/java/io/github/zrdzn/minecraft/lovelydrop/menu/MenuFacade.java b/plugin/src/main/java/io/github/zrdzn/minecraft/lovelydrop/menu/MenuFacade.java
@@ -174,9 +174,9 @@ public void open(Player player) {
                             return;
                         } else if (action == MenuAction.SWITCH_DROP) {
                             if (userSetting.hasDisabledDrop(menuSlotItemKey)) {
-                                userSetting.addDisabledDrop(menuSlotItemKey);
-                            } else {
                                 userSetting.removeDisabledDrop(menuSlotItemKey);
+                            } else {
+                                userSetting.addDisabledDrop(menuSlotItemKey);
                             }
 
                             this.messageFacade.sendMessage(player, messageConfig.getDropSwitched(), "{DROP}", menuSlotItemKey);
@@ -192,9 +192,9 @@ public void open(Player player) {
                         return;
                     } else if (action == MenuAction.SWITCH_DROP) {
                         if (userSetting.hasDisabledDrop(menuSlotItemKey)) {
-                            userSetting.addDisabledDrop(menuSlotItemKey);
-                        } else {
                             userSetting.removeDisabledDrop(menuSlotItemKey);
+                        } else {
+                            userSetting.addDisabledDrop(menuSlotItemKey);
                         }
 
                         this.messageFacade.sendMessage(player, messageConfig.getDropSwitched(), "{DROP}", menuSlotItemKey);

diff --git a/plugin/src/main/java/io/github/zrdzn/minecraft/lovelydrop/user/UserSetting.java b/plugin/src/main/java/io/github/zrdzn/minecraft/lovelydrop/user/UserSetting.java
@@ -1,6 +1,5 @@
 package io.github.zrdzn.minecraft.lovelydrop.user;
 
-import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -30,7 +29,7 @@ public boolean hasDisabledDrop(String dropKey) {
     }
 
     public Set<String> getDisabledDrops() {
-        return Collections.unmodifiableSet(this.disabledDrops);
+        return this.disabledDrops;
     }
 
     public void removeDisabledDrop(String dropKey) {
@@ -50,7 +49,7 @@ public boolean hasDropToInventory(String dropKey) {
     }
 
     public Map<String, Boolean> getDropsToInventory() {
-        return Collections.unmodifiableMap(this.dropsToInventory);
+        return this.dropsToInventory;
     }
 
 }