--- a/net/minecraft/world/item/ItemTrident.java +++ b/net/minecraft/world/item/ItemTrident.java @@ -72,7 +72,7 @@ if (k <= 0 || entityhuman.isInWaterOrRain()) { if (!world.isClientSide) { - itemstack.hurtAndBreak(1, entityhuman, EntityLiving.getSlotForHand(entityliving.getUsedItemHand())); + // itemstack.hurtAndBreak(1, entityhuman, EntityLiving.getSlotForHand(entityliving.getUsedItemHand())); // CraftBukkit - moved down if (k == 0) { EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack); @@ -81,11 +81,26 @@ entitythrowntrident.pickup = EntityArrow.PickupStatus.CREATIVE_ONLY; } - world.addFreshEntity(entitythrowntrident); + // CraftBukkit start + if (!world.addFreshEntity(entitythrowntrident)) { + if (entityhuman instanceof net.minecraft.server.level.EntityPlayer) { + ((net.minecraft.server.level.EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); + } + return; + } + + itemstack.hurtAndBreak(1, entityhuman, EntityLiving.getSlotForHand(entityliving.getUsedItemHand())); + entitythrowntrident.pickupItemStack = itemstack.copy(); // SPIGOT-4511 update since damage call moved + // CraftBukkit end + world.playSound((EntityHuman) null, (Entity) entitythrowntrident, SoundEffects.TRIDENT_THROW, SoundCategory.PLAYERS, 1.0F, 1.0F); if (!entityhuman.hasInfiniteMaterials()) { entityhuman.getInventory().removeItem(itemstack); } + // CraftBukkit start - SPIGOT-5458 also need in this branch :( + } else { + itemstack.hurtAndBreak(1, entityhuman, EntityLiving.getSlotForHand(entityliving.getUsedItemHand())); + // CraftBukkkit end } } @@ -102,6 +117,7 @@ f2 *= f6 / f5; f3 *= f6 / f5; f4 *= f6 / f5; + org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerRiptideEvent(entityhuman, itemstack, f2, f3, f4); // CraftBukkit entityhuman.push((double) f2, (double) f3, (double) f4); entityhuman.startAutoSpinAttack(20); if (entityhuman.onGround()) {