mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 19:49:35 +01:00
db29270cd0
By: 2008Choco <hawkeboyz2@hotmail.com>
55 lines
3 KiB
Diff
55 lines
3 KiB
Diff
--- a/net/minecraft/world/item/ItemTrident.java
|
|
+++ b/net/minecraft/world/item/ItemTrident.java
|
|
@@ -68,9 +68,12 @@
|
|
|
|
if (k <= 0 || entityhuman.isInWaterOrRain()) {
|
|
if (!world.isClientSide) {
|
|
+ // CraftBukkit - moved down
|
|
+ /*
|
|
itemstack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
|
|
entityhuman1.broadcastBreakEvent(entityliving.getUsedItemHand());
|
|
});
|
|
+ */
|
|
if (k == 0) {
|
|
EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack);
|
|
|
|
@@ -79,11 +82,30 @@
|
|
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, (entityhuman1) -> {
|
|
+ entityhuman1.broadcastBreakEvent(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.getAbilities().instabuild) {
|
|
entityhuman.getInventory().removeItem(itemstack);
|
|
}
|
|
+ // CraftBukkit start - SPIGOT-5458 also need in this branch :(
|
|
+ } else {
|
|
+ itemstack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
|
|
+ entityhuman1.broadcastBreakEvent(entityliving.getUsedItemHand());
|
|
+ });
|
|
+ // CraftBukkkit end
|
|
}
|
|
}
|
|
|
|
@@ -100,6 +122,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()) {
|