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>
30 lines
1.8 KiB
Diff
30 lines
1.8 KiB
Diff
--- a/net/minecraft/world/item/ThrowablePotionItem.java
|
|
+++ b/net/minecraft/world/item/ThrowablePotionItem.java
|
|
@@ -23,11 +_,24 @@
|
|
public InteractionResult use(Level level, Player player, InteractionHand hand) {
|
|
ItemStack itemInHand = player.getItemInHand(hand);
|
|
if (level instanceof ServerLevel serverLevel) {
|
|
- Projectile.spawnProjectileFromRotation(this::createPotion, serverLevel, itemInHand, player, -20.0F, PROJECTILE_SHOOT_POWER, 1.0F);
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ final Projectile.Delayed<AbstractThrownPotion> thrownPotion = Projectile.spawnProjectileFromRotationDelayed(this::createPotion, serverLevel, itemInHand, player, -20.0F, PROJECTILE_SHOOT_POWER, 1.0F);
|
|
+ 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(itemInHand), (org.bukkit.entity.Projectile) thrownPotion.projectile().getBukkitEntity());
|
|
+ if (event.callEvent() && thrownPotion.attemptSpawn()) {
|
|
+ if (event.shouldConsume()) {
|
|
+ itemInHand.consume(1, player);
|
|
+ } else {
|
|
+ player.containerMenu.sendAllDataToRemote();
|
|
+ }
|
|
+ } else {
|
|
+ player.containerMenu.sendAllDataToRemote();
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
}
|
|
|
|
player.awardStat(Stats.ITEM_USED.get(this));
|
|
- itemInHand.consume(1, player);
|
|
+ // Paper - PlayerLaunchProjectileEvent - move up
|
|
return InteractionResult.SUCCESS;
|
|
}
|
|
|