mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 19:49:35 +01:00
31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
--- a/net/minecraft/world/item/ThrowablePotionItem.java
|
|
+++ b/net/minecraft/world/item/ThrowablePotionItem.java
|
|
@@ -22,11 +_,25 @@
|
|
public InteractionResult use(Level level, Player player, InteractionHand hand) {
|
|
ItemStack itemInHand = player.getItemInHand(hand);
|
|
if (level instanceof ServerLevel serverLevel) {
|
|
- Projectile.spawnProjectileFromRotation(ThrownPotion::new, serverLevel, itemInHand, player, -20.0F, PROJECTILE_SHOOT_POWER, 1.0F);
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ final Projectile.Delayed<ThrownPotion> thrownPotion = Projectile.spawnProjectileFromRotationDelayed(ThrownPotion::new, 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();
|
|
+ }
|
|
+
|
|
+ player.awardStat(Stats.ITEM_USED.get(this));
|
|
+ } 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;
|
|
}
|
|
|