Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't check block items for armor swapping

This commit is contained in:
Nassim Jahnke 2023-06-22 11:03:11 +02:00
parent 0bb940e42d
commit 4971eeab6a
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java
View File

@ -39,12 +39,16 @@ public final class ArmorToggleListener extends ViaBukkitListener {
public void itemUse(final PlayerInteractEvent event) { public void itemUse(final PlayerInteractEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final ItemStack item = event.getItem(); final ItemStack item = event.getItem();
if (item == null || event.getHand() == null || !isOnPipe(player)) { if (item == null || event.getHand() == null) {
return; return;
} }
final EquipmentSlot armorItemSlot = item.getType().getEquipmentSlot(); final EquipmentSlot armorItemSlot = item.getType().getEquipmentSlot();
if (armorItemSlot != EquipmentSlot.HAND && armorItemSlot != EquipmentSlot.OFF_HAND) { if (armorItemSlot == EquipmentSlot.HAND || armorItemSlot == EquipmentSlot.OFF_HAND || item.getType().isBlock()) {
return;
}
if (isOnPipe(player)) {
final PlayerInventory inventory = player.getInventory(); final PlayerInventory inventory = player.getInventory();
final ItemStack armor = inventory.getItem(armorItemSlot); final ItemStack armor = inventory.getItem(armorItemSlot);
// If two pieces of armor are equal, the client will do nothing. // If two pieces of armor are equal, the client will do nothing.