Skip to content

Commit 5e85028

Browse files
committed
Revert "fix #534"
This reverts commit 7ac6432.
1 parent 7dc1b6c commit 5e85028

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/updater/PlayerItemOrigin.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import lombok.NonNull;
44
import lombok.Setter;
55
import net.minestom.server.item.ItemStack;
6-
import net.swofty.type.skyblockgeneric.gui.inventories.sbmenu.GUISkyBlockMenu;
76
import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
87
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
98

@@ -14,7 +13,13 @@
1413
import java.util.function.Function;
1514

1615
public enum PlayerItemOrigin {
17-
MAIN_HAND((entry) -> entry.getKey().getItemInMainHand(), (player, entry) -> player.setItemInMainHand(entry.getKey()), true),
16+
MAIN_HAND((entry) -> {
17+
SkyBlockPlayer player = entry.getKey();
18+
// We don't want to update the item of a player who is in a ShopGUI
19+
if (player.getOpenInventory() == null)
20+
return entry.getKey().getItemInMainHand();
21+
return null;
22+
}, (player, entry) -> player.setItemInMainHand(entry.getKey()), true),
1823
HELMET((entry) -> entry.getKey().getHelmet(), (player, entry) -> player.setHelmet(entry.getKey()), true),
1924
CHESTPLATE((entry) -> entry.getKey().getChestplate(), (player, entry) -> player.setChestplate(entry.getKey()), true),
2025
LEGGINGS((entry) -> entry.getKey().getLeggings(), (player, entry) -> player.setLeggings(entry.getKey()), true),

0 commit comments

Comments
 (0)