Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2024-11-15 10:55:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with the backpack item detection on Paper

Browse Source
This commit is contained in:
GeorgH93 2021-03-11 23:18:54 +01:00
parent 0aee9bf302
commit 0cee4ba066
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemShortcut.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 GeorgH93
* Copyright (C) 2021 GeorgH93
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -50,7 +50,7 @@
public class ItemShortcut extends MinepacksListener
{
private static final UUID MINEPACKS_UUID = UUID.nameUUIDFromBytes("Minepacks".getBytes());
private final String itemName, value, openCommand;
private final String itemName, itemNameNoReset, value, openCommand;
private final Message messageDoNotRemoveItem;
private final boolean improveDeathChestCompatibility, blockAsHat, allowRightClickOnContainers, blockItemFromMoving;
private final int preferredSlotId;
@ -60,6 +60,7 @@ public ItemShortcut(final @NotNull Minepacks plugin)
{
super(plugin);
itemName = ChatColor.translateAlternateColorCodes('&', plugin.getConfiguration().getItemShortcutItemName());
itemNameNoReset = itemName.replace(ChatColor.RESET.toString(), "");
value = plugin.getConfiguration().getItemShortcutHeadValue();
improveDeathChestCompatibility = plugin.getConfiguration().isItemShortcutImproveDeathChestCompatibilityEnabled();
blockAsHat = plugin.getConfiguration().isItemShortcutBlockAsHatEnabled();
@ -86,8 +87,9 @@ public ItemShortcut(final @NotNull Minepacks plugin)
public boolean isItemShortcut(final @Nullable ItemStack stack)
{
//noinspection ConstantConditions
return stack != null && stack.getType() == HeadUtils.HEAD_MATERIAL && stack.hasItemMeta() && itemName.equals(stack.getItemMeta().getDisplayName());
if(stack == null || stack.getType() != HeadUtils.HEAD_MATERIAL || !stack.hasItemMeta()) return false;
String itemDisplayName = stack.getItemMeta().getDisplayName();
return itemDisplayName != null && itemNameNoReset.equals(itemDisplayName.replace(ChatColor.RESET.toString(), ""));
}
private void addItem(Player player)