f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
54 lines
3.7 KiB
Diff
54 lines
3.7 KiB
Diff
--- a/net/minecraft/world/item/TridentItem.java
|
|
+++ b/net/minecraft/world/item/TridentItem.java
|
|
@@ -79,18 +_,39 @@
|
|
.orElse(SoundEvents.TRIDENT_THROW);
|
|
player.awardStat(Stats.ITEM_USED.get(this));
|
|
if (level instanceof ServerLevel serverLevel) {
|
|
- stack.hurtWithoutBreaking(1, player);
|
|
+ // stack.hurtWithoutBreaking(1, player); // CraftBukkit - moved down
|
|
if (tridentSpinAttackStrength == 0.0F) {
|
|
- ItemStack itemStack = stack.consumeAndReturn(1, player);
|
|
- ThrownTrident thrownTrident = Projectile.spawnProjectileFromRotation(
|
|
+ ItemStack itemStack = stack.copyWithCount(1); // Paper
|
|
+ Projectile.Delayed<ThrownTrident> tridentDelayed = Projectile.spawnProjectileFromRotationDelayed( // Paper - PlayerLaunchProjectileEvent(
|
|
ThrownTrident::new, serverLevel, itemStack, player, 0.0F, 2.5F, 1.0F
|
|
);
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), (org.bukkit.entity.Projectile) tridentDelayed.projectile().getBukkitEntity());
|
|
+ if (!event.callEvent() || !tridentDelayed.attemptSpawn()) {
|
|
+ // CraftBukkit start
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
+ player.containerMenu.sendAllDataToRemote();
|
|
+ return false;
|
|
+ }
|
|
+ ThrownTrident thrownTrident = tridentDelayed.projectile(); // Paper - PlayerLaunchProjectileEvent
|
|
+ if (event.shouldConsume()) {
|
|
+ stack.hurtWithoutBreaking(1, player); // Paper - PlayerLaunchProjectileEvent
|
|
+ }
|
|
+ thrownTrident.pickupItemStack = stack.copy(); // SPIGOT-4511 update since damage call moved
|
|
+ if (event.shouldConsume()) {
|
|
+ stack.consume(1, player);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (player.hasInfiniteMaterials()) {
|
|
thrownTrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
|
|
}
|
|
|
|
level.playSound(null, thrownTrident, holder.value(), SoundSource.PLAYERS, 1.0F, 1.0F);
|
|
return true;
|
|
+ // CraftBukkit start - SPIGOT-5458 also need in this branch :(
|
|
+ } else {
|
|
+ stack.hurtWithoutBreaking(1, player);
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -104,6 +_,7 @@
|
|
f *= tridentSpinAttackStrength / squareRoot;
|
|
f1 *= tridentSpinAttackStrength / squareRoot;
|
|
f2 *= tridentSpinAttackStrength / squareRoot;
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerRiptideEvent(player, stack, f, f1, f2); // CraftBukkit
|
|
player.push(f, f1, f2);
|
|
player.startAutoSpinAttack(20, 8.0F, stack);
|
|
if (player.onGround()) {
|