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

Remove ignoreCancelled from ArmorToggleListener, small cleanup 

Spigot considers interacting with air "cancelled"
Fixes #3240
This commit is contained in:
Nassim Jahnke 2023-03-15 09:20:21 +01:00
parent fccfadf1b7
commit a828c43f99
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
public final class ArmorToggleListener extends ViaBukkitListener { public final class ArmorToggleListener extends ViaBukkitListener {
@ -46,23 +47,26 @@ public final class ArmorToggleListener extends ViaBukkitListener {
} }
} }
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR)
public void itemUse(final PlayerInteractEvent event) { public void itemUse(final PlayerInteractEvent event) {
if (!ENABLED) { if (!ENABLED) {
return; return;
} }
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (!isOnPipe(player) || event.getItem() == null) { final ItemStack item = event.getItem();
if (item == null || event.getHand() == null || !isOnPipe(player)) {
return; return;
} }
final EquipmentSlot equipmentSlot = event.getItem().getType().getEquipmentSlot(); final EquipmentSlot armorItemSlot = item.getType().getEquipmentSlot();
if (equipmentSlot != EquipmentSlot.HAND && equipmentSlot != EquipmentSlot.OFF_HAND) { if (armorItemSlot != EquipmentSlot.HAND && armorItemSlot != EquipmentSlot.OFF_HAND) {
final ItemStack armor = player.getInventory().getItem(equipmentSlot); final PlayerInventory inventory = player.getInventory();
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.
if (armor != null && armor.getType() != Material.AIR && !armor.equals(event.getItem())) { if (armor != null && armor.getType() != Material.AIR && !armor.equals(item)) {
player.updateInventory(); inventory.setItem(event.getHand(), inventory.getItem(event.getHand()));
inventory.setItem(armorItemSlot, armor);
} }
} }
} }